1.1 --- a/etc/settings	Fri Dec 05 11:42:27 2008 +0100
     1.2 +++ b/etc/settings	Fri Dec 05 18:15:52 2008 +0100
     1.3 @@ -75,8 +75,11 @@
     1.4  ISABELLE_SCALA="scala"
     1.5  ISABELLE_JAVA="java"
     1.6  
     1.7 -[ -e "$ISABELLE_HOME/contrib/scala" ] && \
     1.8 +if [ -e "$ISABELLE_HOME/contrib/scala" ]; then
     1.9    classpath "$ISABELLE_HOME/contrib/scala/lib/scala-library.jar"
    1.10 +elif [ -e "$ISABELLE_HOME/../scala" ]; then
    1.11 +  classpath "$ISABELLE_HOME/../scala/lib/scala-library.jar"
    1.12 +fi
    1.13  
    1.14  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.15  
    1.16 @@ -232,10 +235,22 @@
    1.17  ## Set HOME only for tools you have installed!
    1.18  
    1.19  # External provers
    1.20 -E_HOME=$(choosefrom "$ISABELLE_HOME/contrib/E/$ML_PLATFORM" "/usr/local/E" "")
    1.21 -VAMPIRE_HOME=$(choosefrom "$ISABELLE_HOME/contrib/vampire/$ML_PLATFORM" "/usr/local/Vampire" \
    1.22 -  "$ISABELLE_HOME/contrib/SystemOnTPTP" "")
    1.23 -SPASS_HOME=$(choosefrom "$ISABELLE_HOME/contrib/spass/$ML_PLATFORM/bin" "/usr/local/SPASS" "")
    1.24 +E_HOME=$(choosefrom \
    1.25 +  "$ISABELLE_HOME/contrib/E/$ML_PLATFORM" \
    1.26 +  "$ISABELLE_HOME/../E/$ML_PLATFORM" \
    1.27 +  "/usr/local/E" \
    1.28 +  "")
    1.29 +VAMPIRE_HOME=$(choosefrom \
    1.30 +  "$ISABELLE_HOME/contrib/vampire/$ML_PLATFORM" \
    1.31 +  "$ISABELLE_HOME/../vampire/$ML_PLATFORM" \
    1.32 +  "/usr/local/Vampire" \
    1.33 +  "$ISABELLE_HOME/contrib/SystemOnTPTP" \
    1.34 +  "")
    1.35 +SPASS_HOME=$(choosefrom \
    1.36 +  "$ISABELLE_HOME/contrib/spass/$ML_PLATFORM/bin" \
    1.37 +  "$ISABELLE_HOME/../spass/$ML_PLATFORM/bin" \
    1.38 +  "/usr/local/SPASS" \
    1.39 +  "")
    1.40  
    1.41  # HOL4 proof objects (cf. Isabelle/src/HOL/Import)
    1.42  #HOL4_PROOFS="$ISABELLE_HOME_USER/proofs:$ISABELLE_HOME/proofs"