instsetoo_native/CustomTarget_setup.mk | 2 +-
scp2/source/ooo/ure.scp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aa888a88696f6864fd771c948d0831d53a206939
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 16 20:37:56 2014 +0200
Wrong URE_INTERNAL_LIB_DIR value for MACOSX
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index f201434..79cf5ec 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -155,7 +155,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
- && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter
MACOSX,$(OS)),/../../Frameworks)' \
+ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter
MACOSX,$(OS)),/../../../Frameworks)' \
&& echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out
WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
&& echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out
WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index b911a16..1f551ce7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -173,7 +173,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
Section = "Bootstrap";
Key = "URE_INTERNAL_LIB_DIR";
#if defined MACOSX
- Value = "${ORIGIN}/../../Frameworks";
+ Value = "${ORIGIN}/../../../Frameworks";
#else
Value = "${ORIGIN}";
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
