# HG changeset patch
# User wenzelm
# Date 967071203 -7200
# Node ID 6dca83af209bd59a5260368fedc6ea26e5b50794
# Parent  97bd508bcb637753e57b9aff3adb4e4c9e8d70a1
choosefrom: easy settings;

diff -r 97bd508bcb63 -r 6dca83af209b etc/settings
--- a/etc/settings	Wed Aug 23 15:24:46 2000 +0200
+++ b/etc/settings	Thu Aug 24 00:53:23 2000 +0200
@@ -15,7 +15,9 @@
 # you are doing.
 
 # Poly/ML 3.x
-POLYML_HOME=$ISABELLE_HOME/../polyml
+POLYML_HOME=$(choosefrom \
+  "$ISABELLE_HOME/contrib/polyml" \
+  "$ISABELLE_HOME/../polyml")
 ML_PLATFORM=$($POLYML_HOME/bin/polyml-platform 2>/dev/null)
 ML_HOME=$POLYML_HOME/$ML_PLATFORM
 ML_SYSTEM=polyml-3.x
@@ -142,18 +144,18 @@
 ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode
 ISAMODE_OPTIONS=""
 
-# Proof General -- make default if found in canonical place
-if [ -d "$ISABELLE_HOME/contrib/ProofGeneral" ]; then
-  ISABELLE_INTERFACE="$ISABELLE_HOME/contrib/ProofGeneral/isar/interface"
-elif [ -d "$ISABELLE_HOME/../ProofGeneral" ]; then
-  ISABELLE_INTERFACE="$ISABELLE_HOME/../ProofGeneral/isar/interface"
-fi
+# Proof General
+ISABELLE_INTERFACE=$(choosefrom \
+  "$ISABELLE_HOME/contrib/ProofGeneral/isar/interface" \
+  "$ISABELLE_HOME/../ProofGeneral/isar/interface" \
+  "$ISABELLE_INTERFACE")
 PROOFGENERAL_OPTIONS=""
 
-# X-Symbol mode -- look in canonical place
-if [ -d "$ISABELLE_HOME/contrib/x-symbol" ]; then
-  XSYMBOL_HOME="$ISABELLE_HOME/contrib/x-symbol"
-fi
+# X-Symbol mode
+XSYMBOL_HOME=$(choosefrom \
+  "$ISABELLE_HOME/contrib/x-symbol" \
+  "$ISABELLE_HOME/../x-symbol" \
+  "")
 
 
 ###