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

Wrong URE_INTERNAL_LIB_DIR value for MACOSX

Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
üst e26a0ea8
......@@ -155,7 +155,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../Frameworks)' \
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../../Frameworks)' \
&& 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}' \
......
......@@ -173,7 +173,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
Section = "Bootstrap";
Key = "URE_INTERNAL_LIB_DIR";
#if defined MACOSX
Value = "${ORIGIN}/../../Frameworks";
Value = "${ORIGIN}/../../../Frameworks";
#else
Value = "${ORIGIN}";
#endif
......
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