diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 15:24:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 15:32:26 +0100 |
| commit | 8fdb23973521125892d4a99dc4e33463680a0047 (patch) | |
| tree | d5def1867b36ff531563ff50de4ddbe5025585e5 /instsetoo_native | |
| parent | 3c0fabfb477e0f5666691e0d65ab24b65c0a3e9d (diff) | |
Fold URE: Linux ure/share/java/* -> program/classes/
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 052a51edd25e..b2bd939789c2 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -120,7 +120,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)),/ure-link)$(if $(filter-out WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \ + && echo 'URE_INTERNAL_JAVA_DIR=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../../java,$(if $(filter WNT,$(OS)),$${ORIGIN}/../java,$${ORIGIN}/classes))' \ && echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \ && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \ && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \ |