instsetoo_native/CustomTarget_setup.mk | 2 +-
scp2/source/ooo/ure.scp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e26a0ea8bf608075d044b47e3ca2182fd61e8d00
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 16 20:13:01 2014 +0200
Wrong URE_INTERNAL_JAVA_DIR value for MACOSX
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index fcb7858..f201434 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -156,7 +156,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
( \
echo '[Bootstrap]' \
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter
MACOSX,$(OS)),/../../Frameworks)' \
- && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out
MACOSX WNT,$(OS)),/share)/java' \
+ && 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}' \
&& echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out
WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 8654809..b911a16 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -185,7 +185,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
Section = "Bootstrap";
Key = "URE_INTERNAL_JAVA_DIR";
#if defined MACOSX
- Value = "${ORIGIN}/../java";
+ Value = "${ORIGIN}/../../java";
#elif defined WNT
Value = "${ORIGIN}/../java";
#else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
