Merge remote-tracking branch 'ecki/mng-5686'

This commit is contained in:
Mirko Friedenhagen 2015-01-22 21:43:03 +01:00
commit eea4252f5d
3 changed files with 15 additions and 1 deletions

View File

@ -83,7 +83,7 @@ case "`uname`" in
#
# Apple JDKs
#
export JAVA_HOME=/usr/libexec/java_home
export JAVA_HOME=`/usr/libexec/java_home`
fi
;;
esac

View File

@ -82,6 +82,13 @@ case "`uname`" in
#
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
#
# Apple JDKs
#
export JAVA_HOME=`/usr/libexec/java_home`
fi
;;
esac

View File

@ -86,6 +86,13 @@ case "`uname`" in
#
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
#
# Apple JDKs
#
export JAVA_HOME=`/usr/libexec/java_home`
fi
;;
esac