diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 20:13:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 20:13:01 +0200 |
| commit | e26a0ea8bf608075d044b47e3ca2182fd61e8d00 (patch) | |
| tree | b1c2239b255deb5940347c9de8d5532df3b166ee | |
| parent | cfc4650c8594334edecc3b50ca54461f6bee2d43 (diff) | |
Wrong URE_INTERNAL_JAVA_DIR value for MACOSX
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index fcb7858be7de..f20143419f63 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 86548095cc27..b911a1628dc7 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 |