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 /instsetoo_native | |
parent | Resolves: fdo#86799 fix insert special char in Find/Find and Replace (diff) | |
download | core-982f199a98a7d82e0109077882a645f1a442049e.tar.gz core-982f199a98a7d82e0109077882a645f1a442049e.zip |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index b2bd939789c2..3ed8cc79852d 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -122,8 +122,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../../Frameworks)' \ && 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}' \ + && echo 'UNO_TYPES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/))types.rdb $${URE_MORE_TYPES}' \ + && echo 'UNO_SERVICES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$(if $(filter WNT,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/))services.rdb $${URE_MORE_SERVICES}' \ ) > $@ .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) |