From 0c3f80cbbe5f21209439a3173620e537bdcdb8dc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 16 Sep 2014 23:27:21 +0200 Subject: Use OO_SDK_URE_BIN_DIR Change-Id: Ifd40e523f146ee26f49fe443e2455d053c7b6bfc --- odk/settings/std.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'odk') 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) \ -- cgit