diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 17:53:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 17:53:16 +0200 |
commit | 851b5a973e04c0c9dda585dbe5ef290b78cc3951 (patch) | |
tree | 6a81eafbc49e34f4d6bd43fbbf41c7d28ab95b01 | |
parent | 3dd3e964d5426982304afd84205c30ec9dd45622 (diff) |
Wrong UNO_TYPES value for MACOSX
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index ec69b17bc580..fcb7858be7de 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 cb143ae92276..86548095cc27 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}"; |