Changeset 30384 for local

Show
Ignore:
Timestamp:
26.02.2016 15:47:16 (3 years ago)
Author:
davidb
Message:

updates after testing on Yosemite mac laptop

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • local/greenstone3/darwin-64bit/gs3-setup.bash

    r27883 r30384  
    44if [ "x$ANT_HOME" = "x" ] ; then 
    55 
    6   export ANT_HOME=`pwd`/ant-1.8.3 
     6  export ANT_HOME=`pwd`/apache-ant-1.9.6 
    77  export PATH=$ANT_HOME/bin:$PATH 
    88 
     
    1414 
    1515##export JAVA_HOME=/System//Library/Frameworks/JavaVM.framework/Home 
    16 export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home 
     16#export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home 
     17export JAVA_HOME=`/usr/libexec/java_home` 
     18 
     19export CFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin" 
     20export CXXFLAGS="$CFLAGS" 
     21export JNICFLAGS="$CFLAGS" 
    1722 
    1823export PATH=$JAVA_HOME/bin:$PATH