# HG changeset patch
# User wenzelm
# Date 1316342925 -7200
# Node ID 5b8d39b1360ef7e9945f28a67e1f6de4946f897a
# Parent  640c2b957f164a105d3a16e6bbd00f53f988ed92
discontinued hard-wired JAVA_HOME treatment for Mac OS X (cf. f471a2fb9a95), which can cause confusions of "isabelle java" vs. "isabelle scala" -- moved settings to external component;

diff -r 640c2b957f16 -r 5b8d39b1360e etc/settings
--- a/etc/settings	Sun Sep 18 00:05:22 2011 +0200
+++ b/etc/settings	Sun Sep 18 12:48:45 2011 +0200
@@ -56,8 +56,6 @@
 
 if [ -n "$JAVA_HOME" ]; then
   ISABELLE_JAVA="$JAVA_HOME/bin/java"
-elif [ -x /usr/libexec/java_home ]; then
-  ISABELLE_JAVA="$(/usr/libexec/java_home -v 1.6)"/bin/java
 else
   ISABELLE_JAVA="java"
 fi