1.1 --- a/etc/settings	Mon Nov 15 15:41:58 2010 +0100
     1.2 +++ b/etc/settings	Mon Nov 15 17:14:43 2010 +0100
     1.3 @@ -18,13 +18,13 @@
     1.4  # Poly/ML 5.x (automated settings)
     1.5  POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
     1.6  ML_PLATFORM="$ISABELLE_PLATFORM"
     1.7 -ML_HOME=$(choosefrom \
     1.8 +ML_HOME="$(choosefrom \
     1.9    "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
    1.10    "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
    1.11    "/usr/local/polyml/$ML_PLATFORM" \
    1.12    "/usr/share/polyml/$ML_PLATFORM" \
    1.13    "/opt/polyml/$ML_PLATFORM" \
    1.14 -  $POLY_HOME)
    1.15 +  "$POLY_HOME")"
    1.16  ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
    1.17  ML_OPTIONS="-H 200"
    1.18  ML_SOURCES="$ML_HOME/../src"
    1.19 @@ -170,13 +170,13 @@
    1.20  ###
    1.21  
    1.22  # Proof General home, look in a variety of places
    1.23 -PROOFGENERAL_HOME=$(choosefrom \
    1.24 +PROOFGENERAL_HOME="$(choosefrom \
    1.25    "$ISABELLE_HOME/contrib/ProofGeneral" \
    1.26    "$ISABELLE_HOME/../ProofGeneral" \
    1.27    "/usr/local/ProofGeneral" \
    1.28    "/usr/share/ProofGeneral" \
    1.29    "/opt/ProofGeneral" \
    1.30 -  "")
    1.31 +  "")"
    1.32  
    1.33  PROOFGENERAL_OPTIONS=""
    1.34  #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"

     2.1 --- a/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 15:41:58 2010 +0100
     2.2 +++ b/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 17:14:43 2010 +0100
     2.3 @@ -1,16 +1,17 @@
     2.4 +# -*- shell-script -*- :mode=shellscript:
     2.5  
     2.6 -EXEC_SWIPL=$(choosefrom \
     2.7 +EXEC_SWIPL="$(choosefrom \
     2.8    "$ISABELLE_HOME/contrib/swipl/$ISABELLE_PLATFORM/bin/swipl" \
     2.9    "$ISABELLE_HOME/contrib_devel/swipl/$ISABELLE_PLATFORM/bin/swipl" \
    2.10    "$ISABELLE_HOME/../swipl" \
    2.11    $(type -p swipl) \
    2.12 -  "")
    2.13 +  "")"
    2.14  
    2.15 -EXEC_YAP=$(choosefrom \
    2.16 +EXEC_YAP="$(choosefrom \
    2.17    "$ISABELLE_HOME/contrib/yap/$ISABELLE_PLATFORM/bin/yap" \
    2.18    "$ISABELLE_HOME/contrib_devel/yap/$ISABELLE_PLATFORM/bin/yap" \
    2.19    "$ISABELLE_HOME/../yap" \
    2.20    $(type -p yap) \
    2.21 -  "")
    2.22 +  "")"
    2.23  
    2.24  SWIPL_VERSION=$("$COMPONENT/lib/scripts/swipl_version")

     3.1 --- a/src/Tools/Code/etc/settings	Mon Nov 15 15:41:58 2010 +0100
     3.2 +++ b/src/Tools/Code/etc/settings	Mon Nov 15 17:14:43 2010 +0100
     3.3 @@ -1,14 +1,15 @@
     3.4 +# -*- shell-script -*- :mode=shellscript:
     3.5  
     3.6  ISABELLE_TOOLS="$ISABELLE_TOOLS:$COMPONENT/lib/Tools"
     3.7  
     3.8 -EXEC_GHC=$(choosefrom \
     3.9 +EXEC_GHC="$(choosefrom \
    3.10    "$ISABELLE_HOME/contrib/ghc/$ISABELLE_PLATFORM/ghc" \
    3.11    "$ISABELLE_HOME/../ghc/$ISABELLE_PLATFORM/ghc" \
    3.12 -  $(type -p ghc) \
    3.13 -  "")
    3.14 +  "$(type -p ghc)" \
    3.15 +  "")"
    3.16  
    3.17 -EXEC_OCAML=$(choosefrom \
    3.18 +EXEC_OCAML="$(choosefrom \
    3.19    "$ISABELLE_HOME/contrib/ocaml/$ISABELLE_PLATFORM/ocaml" \
    3.20    "$ISABELLE_HOME/../ocaml/$ISABELLE_PLATFORM/ocaml" \
    3.21 -  $(type -p ocaml) \
    3.22 -  "")
    3.23 +  "$(type -p ocaml)" \
    3.24 +  "")"