diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:19 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:32 +0100 |
commit | 982f199a98a7d82e0109077882a645f1a442049e (patch) | |
tree | 733bef575b66d224fc4c03cfecf69f86b1fbed27 /jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk | |
parent | 8fc14413d9dadede63743ec76603d95eb587f580 (diff) |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
Diffstat (limited to 'jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk')
-rw-r--r-- | jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk index 739112a67623..bda983d0f49d 100644 --- a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk +++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfi $(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( printf '[Bootstrap]\n' && \ - printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/javavendors.xml\n' && \ + printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../misc/,$${ORIGIN}/))javavendors.xml\n' && \ printf 'UNO_JAVA_JFW_SHARED_DATA=$${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}\n' && \ printf 'UNO_JAVA_JFW_USER_DATA=$${URE_OVERRIDE_JAVA_JFW_USER_DATA}\n' && \ printf 'UNO_JAVA_JFW_CLASSPATH_URLS=$${URE_MORE_JAVA_CLASSPATH_URLS}\n' \ |