Changeset 30384 for local

Timestamp:

2016-02-26T15:47:16+13:00 (8 years ago)

Author:

davidb

Message:

updates after testing on Yosemite mac laptop

File:

• local/greenstone3/darwin-64bit/gs3-setup.bash (modified) (2 diffs)

local/greenstone3/darwin-64bit/gs3-setup.bash

@@ -4 +4 @@
 if [ "x$ANT_HOME" = "x" ] ; then
 
-  export ANT_HOME=`pwd`/ant-1.8.3
+  export ANT_HOME=`pwd`/apache-ant-1.9.6
   export PATH=$ANT_HOME/bin:$PATH
 
@@ -14 +14 @@
 
 ##export JAVA_HOME=/System//Library/Frameworks/JavaVM.framework/Home
-export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+#export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+export JAVA_HOME=`/usr/libexec/java_home`
+
+export CFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin"
+export CXXFLAGS="$CFLAGS"
+export JNICFLAGS="$CFLAGS"
 
 export PATH=$JAVA_HOME/bin:$PATH