summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-16 23:27:21 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-16 23:27:21 +0200
commit0c3f80cbbe5f21209439a3173620e537bdcdb8dc (patch)
treeba15566891fa85ce62899e9f7a942c1d6a5b52b6 /odk
parentaa7852d5aa0dece9febf874ec3ed7e8cc80810d4 (diff)
Use OO_SDK_URE_BIN_DIR
Change-Id: Ifd40e523f146ee26f49fe443e2455d053c7b6bfc
Diffstat (limited to 'odk')
-rw-r--r--odk/settings/std.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 93fa862a2a2b..7d76d9090904 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -70,7 +70,7 @@ SDK_SED="$(OO_SDK_SED_HOME)/sed"
IDLC="$(OO_SDK_HOME)/bin/idlc"
CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
-REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
+REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
SDK_JAVA_UNO_BOOTSTRAP_FILES=\
-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \