--- a/etc/settings Mon Mar 26 11:15:41 2012 +0200
+++ b/etc/settings Sat Mar 24 20:24:16 2012 +0100
@@ -54,10 +54,12 @@
### JVM components (Scala or Java)
###
-if [ -n "$JAVA_HOME" ]; then
- ISABELLE_JAVA="$JAVA_HOME/bin/java"
-else
- ISABELLE_JAVA="java"
+if [ -z "$ISABELLE_JDK_HOME" -a -n "$JAVA_HOME" ]; then
+ if [ "$(basename "$JAVA_HOME")" = jre -a -e "$(dirname "$JAVA_HOME")"/bin/javac ]; then
+ ISABELLE_JDK_HOME="$(dirname "$JAVA_HOME")"
+ else
+ ISABELLE_JDK_HOME="$JAVA_HOME"
+ fi
fi
ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5"