instsetoo_native/CustomTarget_setup.mk | 2 +-
scp2/source/ooo/ure.scp | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 851b5a973e04c0c9dda585dbe5ef290b78cc3951
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 16 17:53:16 2014 +0200
Wrong UNO_TYPES value for MACOSX
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index ec69b17..fcb7858 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -158,7 +158,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& 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_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
- && echo 'UNO_TYPES=$${ORIGIN}/$(if $(filter-out
MACOSX,$(OS)),$(if $(filter-out WNT,$(OS)),../share/)misc/)types.rdb
$${URE_MORE_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 cb143ae..8654809 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -206,9 +206,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
ProfileID = gid_Profile_Dl_Uno_Ini;
Section = "Bootstrap";
Key = "UNO_TYPES";
-#if defined MACOSX
- Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
-#elif defined WNT
+#if defined WNT
Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
#else
Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
