diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 23:39:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 23:39:29 +0200 |
| commit | 8702519ddda114f11380c8bbeaf14c6c8f179693 (patch) | |
| tree | f5de3cce889c9d2bdd21cc735e2f4a03e184070d /odk | |
| parent | 0c3f80cbbe5f21209439a3173620e537bdcdb8dc (diff) | |
Fix OO_SDK_URE_HOME for new Mac OS X layout
Change-Id: I438b9ca643819cfd3e636e8157c6ef491beb1903
Diffstat (limited to 'odk')
| -rwxr-xr-x | odk/config/configure.pl | 8 | ||||
| -rw-r--r-- | odk/config/setsdkenv_unix.sh.in | 15 | ||||
| -rw-r--r-- | odk/settings/settings.mk | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl index 83842e80b262..9f96a270cd26 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -118,13 +118,7 @@ if ( $main::operatingSystem =~ m/darwin/ ) } # check more details - if ( -d "$main::OFFICE_HOME/Contents/ure-link" ) { - $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents/ure-link"; - } else { - $main::OFFICE_HOME = ""; - $main::OO_SDK_URE_HOME = ""; - print " Error: no URE found in office installation, please specify the path to a valid installation.\n"; - } + $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents"; } } else { diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in index 4ab9d6289eab..d7495532a43d 100644 --- a/odk/config/setsdkenv_unix.sh.in +++ b/odk/config/setsdkenv_unix.sh.in @@ -120,9 +120,18 @@ fi if [ "${OO_SDK_URE_HOME}" ] then - OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin - OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib - OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java + case ${sdk_platform} in + darwin*) + OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/MacOS + OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/Frameworks + OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java + ;; + *) + OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin + OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib + OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java + ;; + esac else OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH} OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH} diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 740233ee5978..0377c57ad1c8 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -456,7 +456,7 @@ 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)/share/misc +URE_MISC=$(OO_SDK_URE_HOME)/Resources/ure/share/misc endif endif |