From bfeb4126108ab307d7843cf9f32acf95ae60d06a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 17 Sep 2014 00:15:06 +0200
Subject: Fix OFFICE_PROGRAM_PATH for new Mac OS X layout

Change-Id: Id8c6082b4b90c3020e1187dd311f0afd0320d155
---
 odk/config/setsdkenv_unix.sh.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'odk/config')

diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 60032d3ea2db..4dcd81dbf0dc 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -94,10 +94,12 @@ sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
 # Set the directory name.
 programdir=program
 javadir=bin
+sdk_lo_java_dir=program/classes
 case ${sdk_platform} in
   darwin*)
     programdir="Contents/MacOS"
     javadir=Commands
+    sdk_lo_java_dir=Contents/Resources/java
     ;;
 esac
 
@@ -226,7 +228,7 @@ esac
 PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:${PATH}
 
 # Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_HOME}/$sdk_lo_java_dir/unoil.jar:${CLASSPATH}
 export CLASSPATH
 
 
-- 
cgit v1.2.3