Author: ssteiner
Date: Fri Dec 18 15:28:29 2015
New Revision: 1720811
URL: http://svn.apache.org/viewvc?rev=1720811&view=rev
Log:
FOP-2356: default JAVA_HOME is not compatible with Oracle's JDK on Mac OS X
Modified:
xmlgraphics/fop/trunk/fop
Modified: xmlgraphics/fop/trunk/fop
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop?rev=1720811&r1=1720810&r2=1720811&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop (original)
+++ xmlgraphics/fop/trunk/fop Fri Dec 18 15:28:29 2015
@@ -80,7 +80,11 @@ case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ if [ -x '/usr/libexec/java_home' ] ; then
+ JAVA_HOME=`/usr/libexec/java_home`
+ elif [ -d
"/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+ fi
fi
;;
esac
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
