Kaydet (Commit) e26a0ea8 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Wrong URE_INTERNAL_JAVA_DIR value for MACOSX

Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
üst cfc4650c
......@@ -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}' \
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment