[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild ure/Package_install.mk

[Stephan Bergmann]

 config_host.mk.in           |    1 +
 configure.ac                |    1 +
 solenv/gbuild/Executable.mk |    2 +-
 ure/Package_install.mk      |    4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b5e77357f8d1a2ee2c7831a2a0753f8b10a2c5b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 11 07:29:00 2013 +0200

    Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixes
    
    Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8

diff --git a/config_host.mk.in b/config_host.mk.in
index 14f38fa..f391bdd 100644
--- a/config_host.mk.in
+++ b/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@
diff --git a/configure.ac b/configure.ac
index e3f8543..3989683 100644
--- a/configure.ac
+++ b/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)
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 645d05e..2b8188a 100644
--- a/solenv/gbuild/Executable.mk
+++ b/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 $@))
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index be5976a..cfe8fbd 100644
--- a/ure/Package_install.mk
+++ b/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