diff -Naur Isabelle2009-1/etc/settings Isabelle2009-1-patched/etc/settings
--- Isabelle2009-1/etc/settings	2009-12-02 12:04:07.000000000 +0100
+++ Isabelle2009-1-patched/etc/settings	2009-12-04 16:15:40.000000000 +0100
@@ -16,15 +16,8 @@
 # Only one of the sections below should be activated.
 
 # Poly/ML 5.x (automated settings)
-POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
 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" \
-  $POLY_HOME)
+ML_HOME=@ML_HOME@
 ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
 ML_OPTIONS="-H 200"
 ML_SOURCES="$ML_HOME/../src"
@@ -185,13 +178,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"