diff -Nuar Isabelle2011/etc/settings Isabelle2011-fix/etc/settings
--- Isabelle2011/etc/settings	2011-01-30 13:02:18.000000000 +0100
+++ Isabelle2011-fix/etc/settings	2011-05-14 22:56:04.000000000 +0200
@@ -17,13 +17,7 @@
 
 # Poly/ML 5.x (automated settings)
 ML_PLATFORM="$ISABELLE_PLATFORM"
-ML_HOME="$(choosefrom \
-  "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
-  "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
-  "/usr/local/polyml/$ML_PLATFORM" \
-  "/usr/share/polyml/$ML_PLATFORM" \
-  "/opt/polyml/$ML_PLATFORM" \
-  "")"
+ML_HOME=@ML_HOME@
 ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
 ML_OPTIONS="-H 200"
 ML_SOURCES="$ML_HOME/../src"
@@ -175,13 +169,7 @@
 ###
 
 # Proof General home, look in a variety of places
-PROOFGENERAL_HOME="$(choosefrom \
-  "$ISABELLE_HOME/contrib/ProofGeneral" \
-  "$ISABELLE_HOME/../ProofGeneral" \
-  "/usr/local/ProofGeneral" \
-  "/usr/share/ProofGeneral" \
-  "/opt/ProofGeneral" \
-  "")"
+PROOFGENERAL_HOME=@PROOFGENERAL_HOME@
 
 PROOFGENERAL_OPTIONS=""
 #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"