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 /odk | |
| parent | 8fc14413d9dadede63743ec76603d95eb587f580 (diff) | |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
Diffstat (limited to 'odk')
| -rwxr-xr-x | odk/config/configure.pl | 12 | ||||
| -rw-r--r-- | odk/settings/settings.mk | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl index 9f96a270cd26..70807273adaa 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -93,10 +93,6 @@ $main::return = 0; if ( $main::operatingSystem =~ m/darwin/ ) { -# used for a SDK as part of the office installation -# $main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`; -# chomp($main::OFFICE_HOME); -# print " Used Office = $main::OFFICE_HOME\n"; print " Used SDK = $main::OO_SDK_HOME\n\n"; $main::OFFICE_HOME_SUGGESTION = searchMacOffice(); @@ -117,14 +113,10 @@ if ( $main::operatingSystem =~ m/darwin/ ) print " Error: An office installation is required, please specify the path to a valid installation.\n"; } - # check more details - $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents"; } + $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents"; } else { - $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`; - chomp($main::OO_SDK_URE_HOME); - $main::OFFICE_HOME_SUGGESTION = searchoffice(); if ( $main::OFFICE_HOME_SUGGESTION eq "" ) { @@ -192,6 +184,8 @@ if ( $main::operatingSystem =~ m/darwin/ ) } } } + + $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME"; } # prepare GNU make path diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 0075142d33f8..c7bf3e3a7a89 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -235,9 +235,7 @@ LIBRARY_LINK_FLAGS+=-m64 EXE_LINK_FLAGS+=-m64 endif -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif @@ -349,9 +347,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,- LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif @@ -561,8 +557,6 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -ifneq "$(OO_SDK_URE_HOME)" "" -URE_MISC=$(OO_SDK_URE_HOME)/share/misc -endif +URE_MISC=${OFFICE_PROGRAM_PATH} endif |