--- etc/settings.orig	2009-10-09 10:34:33.000000000 +1100
+++ etc/settings	2009-10-09 10:37:10.000000000 +1100
@@ -11,55 +11,11 @@
 ### ML compiler settings (ESSENTIAL!)
 ###
 
-# ML_HOME specifies the location of the actual compiler binaries.  Do
-# not invent new ML system names unless you know what you are doing.
-# Only one of the sections below should be activated.
-
-# Poly/ML 4.x/5.x (automated settings)
-POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
-ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-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_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-ML_OPTIONS="-H 200"
-ML_DBASE=""
-
-# Poly/ML 5.1
-#ML_PLATFORM=x86-linux
-#ML_HOME=/usr/local/polyml/x86-linux
-#ML_SYSTEM=polyml-5.1
-#ML_OPTIONS="-H 500"
-
-# Poly/ML 5.1 (64 bit)
-#ML_PLATFORM=x86_64-linux
-#ML_HOME=/usr/local/polyml/x86_64-linux
-#ML_SYSTEM=polyml-5.1
-#ML_OPTIONS="-H 1000"
-
-# Poly/ML 4.2.0
-#ML_PLATFORM=x86-linux
-#ML_HOME=/usr/local/polyml/x86-linux
-#ML_SYSTEM=polyml-4.2.0
-#ML_OPTIONS="-H 80"
-
-# Standard ML of New Jersey (slow!)
-#ML_SYSTEM=smlnj-110
-#ML_HOME="/usr/local/smlnj/bin"
-#ML_OPTIONS="@SMLdebug=/dev/null"
-#ML_PLATFORM=$(eval $("$ML_HOME/.arch-n-opsys" 2>/dev/null); echo "$HEAP_SUFFIX")
-#SMLNJ_CYGWIN_RUNTIME=1
-
-# Moscow ML 2.00 (experimental!)
-#ML_SYSTEM=mosml
-#ML_HOME="/usr/local/mosml/bin"
-#ML_OPTIONS=""
-#ML_PLATFORM=""
-
+ML_SYSTEM=%%ML_SYSTEM%%
+ML_HOME=%%ML_HOME%%
+ML_OPTIONS=%%ML_OPTIONS%%
+ML_PLATFORM=%%ML_PLATFORM%%
+ML_DBASE=%%ML_DBASE%%
 
 ###
 ### JVM components (Scala or Java)
@@ -81,7 +37,7 @@
 ### Interactive sessions (cf. isabelle tty)
 ###
 
-ISABELLE_LINE_EDITOR=""
+ISABELLE_LINE_EDITOR="%%LINE_EDIT%%"
 [ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
 [ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p ledit)"
 
@@ -131,7 +87,7 @@
 ISABELLE_TOOLS="$ISABELLE_HOME/lib/Tools"
 
 # Location for temporary files (should be on a local file system).
-ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
+ISABELLE_TMP_PREFIX="%%SYSTMPDIR%%/isabelle-$USER"
 
 # Heap input locations. ML system identifier is included in lookup.
 ISABELLE_PATH="$ISABELLE_HOME_USER/heaps/$ISABELLE_IDENTIFIER:$ISABELLE_HOME/heaps"
@@ -157,7 +113,7 @@
 ###
 
 # Where to look for docs (multiple dirs separated by ':').
-ISABELLE_DOCS="$ISABELLE_HOME/doc"
+ISABELLE_DOCS="%%PREFIX%%/share/doc/isabelle"
 
 # Preferred document format
 ISABELLE_DOC_FORMAT=pdf
@@ -191,9 +147,7 @@
 PROOFGENERAL_HOME=$(choosefrom \
   "$ISABELLE_HOME/contrib/ProofGeneral" \
   "$ISABELLE_HOME/../ProofGeneral" \
-  "/usr/local/ProofGeneral" \
-  "/usr/share/ProofGeneral" \
-  "/opt/ProofGeneral" \
+  "%%PREFIX%%/%%EMACS_SITE_LISPDIR%%/ProofGeneral" \
   "")
 
 PROOFGENERAL_OPTIONS=""
@@ -211,9 +165,7 @@
 JEDIT_HOME=$(choosefrom \
   "$ISABELLE_HOME/contrib/jedit" \
   "$ISABELLE_HOME/../jedit" \
-  "/usr/local/jedit" \
-  "/usr/share/jedit" \
-  "/opt/jedit" \
+  "%%JAVASHAREDIR%%/jedit" \
   "")
 
 JEDIT_JAVA_OPTIONS=""
@@ -231,17 +183,17 @@
 E_HOME=$(choosefrom \
   "$ISABELLE_HOME/contrib/E/$ML_PLATFORM" \
   "$ISABELLE_HOME/../E/$ML_PLATFORM" \
-  "/usr/local/E" \
+  "%%PREFIX%%/E" \
   "")
 VAMPIRE_HOME=$(choosefrom \
   "$ISABELLE_HOME/contrib/vampire/$ML_PLATFORM" \
   "$ISABELLE_HOME/../vampire/$ML_PLATFORM" \
-  "/usr/local/Vampire" \
+  "%%PREFIX%%/Vampire" \
   "")
 SPASS_HOME=$(choosefrom \
   "$ISABELLE_HOME/contrib/spass/$ML_PLATFORM/bin" \
   "$ISABELLE_HOME/../spass/$ML_PLATFORM/bin" \
-  "/usr/local/SPASS" \
+  "%%PREFIX%%/SPASS" \
   "")
 
 # HOL4 proof objects (cf. Isabelle/src/HOL/Import)
@@ -253,24 +205,24 @@
 #SVC_MACHINE=sparc-sun-solaris
 
 # Mucke (mu-calculus model checker)
-#MUCKE_HOME=/usr/local/bin
+#MUCKE_HOME=%%PREFIX%%/bin
 
 # Einhoven model checker
-#EINDHOVEN_HOME=/usr/local/bin
+#EINDHOVEN_HOME=%%PREFIX%%/bin
 
 # MiniSat 1.14 (SAT Solver, cf. Isabelle/src/HOL/Tools/sat_solver.ML)
-#MINISAT_HOME=/usr/local/bin
+#MINISAT_HOME=%%PREFIX%%/bin
 
 # zChaff (SAT Solver, cf. Isabelle/src/HOL/Tools/sat_solver.ML)
-#ZCHAFF_HOME=/usr/local/bin
+#ZCHAFF_HOME=%%PREFIX%%/bin
 
 # BerkMin561 (SAT Solver, cf. Isabelle/src/HOL/Tools/sat_solver.ML)
-#BERKMIN_HOME=/usr/local/bin
+#BERKMIN_HOME=%%PREFIX%%/bin
 #BERKMIN_EXE=BerkMin561-linux
 #BERKMIN_EXE=BerkMin561-solaris
 
 # Jerusat 1.3 (SAT Solver, cf. Isabelle/src/HOL/Tools/sat_solver.ML)
-#JERUSAT_HOME=/usr/local/bin
+#JERUSAT_HOME=%%PREFIX%%/bin
 
 # For configuring HOL/Matrix/cplex
 # LP_SOLVER is the default solver. It can be changed during runtime via Cplex.set_solver.