Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixes

Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8

config_host.mk.in

@@ -313,6 +313,7 @@ export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
 export LIBO_SHARE_JAVA_FOLDER=@LIBO_SHARE_JAVA_FOLDER@
 export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
 export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
+export LIBO_URE_BIN_FOLDER=@LIBO_URE_BIN_FOLDER@
 export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
 export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@
 export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@

configure.ac

@@ -2967,6 +2967,7 @@ AC_SUBST(LIBO_SHARE_HELP_FOLDER)
 AC_SUBST(LIBO_SHARE_JAVA_FOLDER)
 AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
 AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
+AC_SUBST(LIBO_URE_BIN_FOLDER)
 AC_SUBST(LIBO_URE_LIB_FOLDER)
 AC_SUBST(LIBO_URE_SHARE_FOLDER)
 AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER)

solenv/gbuild/Executable.mk

@@ -25,7 +25,7 @@
 # NOTE: SDKBIN executables are already packaged in module odk
 gb_Executable_LAYER_DIRS := \
 	OOO:$(gb_PROGRAMDIRNAME) \
-	UREBIN:ure/bin
+	UREBIN:$(LIBO_URE_BIN_FOLDER) \
 
 $(dir $(call gb_Executable_get_runtime_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))

ure/Package_install.mk

@@ -13,8 +13,8 @@ $(eval $(call gb_Package_set_outdir,ure_install,$(gb_INSTROOT)))
 
 ifneq (WNT,$(OS))
 ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
-$(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh))
+$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,startup.sh))
 endif
 endif