diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 15:41:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 15:42:37 +0100 |
| commit | 0ffe0bf68abcab15cfa2b4c949d30262a4aaa0e0 (patch) | |
| tree | 1c9eed60c97c1f98d794c9a5efa8d5cf2a06ada1 /odk/settings | |
| parent | ce0513a9ee79d29f38db6b6b2bbc662826350eb6 (diff) | |
Fold URE: Remove OO_SDK_URE_HOME on non-Windows
Change-Id: Iad0480eb39e2c1312c27cf9b90146c2beba592fd
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index c7bf3e3a7a89..b8548e37c90e 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -451,9 +451,7 @@ EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-framework JavaVM -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/Resources/ure/share/misc -endif +URE_MISC=$(OFFICE_HOME)/Contents/Resources/ure/share/misc endif |