1.1 --- a/etc/settings	Fri Sep 01 17:47:20 2000 +0200
     1.2 +++ b/etc/settings	Fri Sep 01 17:48:31 2000 +0200
     1.3 @@ -23,26 +23,26 @@
     1.4    "/usr/share/polyml-4.0" \
     1.5    "/usr/share/polyml-3.x" \
     1.6    "/usr/share/polyml")
     1.7 -ML_SYSTEM=$($POLYML_HOME/bin/polyml-version 2>/dev/null || echo polyml)
     1.8 -ML_PLATFORM=$($POLYML_HOME/bin/polyml-platform 2>/dev/null)
     1.9 -ML_HOME=$POLYML_HOME/$ML_PLATFORM
    1.10 +ML_SYSTEM=$("$POLYML_HOME/bin/polyml-version" 2>/dev/null || echo polyml)
    1.11 +ML_PLATFORM=$("$POLYML_HOME/bin/polyml-platform" 2>/dev/null)
    1.12 +ML_HOME="$POLYML_HOME/$ML_PLATFORM"
    1.13  ML_OPTIONS="-h 30000"
    1.14  
    1.15  # Standard ML of New Jersey 110 or later
    1.16  #ML_SYSTEM=smlnj-110
    1.17 -#ML_HOME=$ISABELLE_HOME/../smlnj/bin
    1.18 +#ML_HOME="$ISABELLE_HOME/../smlnj/bin"
    1.19  #ML_OPTIONS="@SMLdebug=/dev/null"
    1.20 -#ML_PLATFORM=$(eval $($ML_HOME/.arch-n-opsys 2>/dev/null); echo $HEAP_SUFFIX)
    1.21 +#ML_PLATFORM=$(eval $("$ML_HOME/.arch-n-opsys" 2>/dev/null); echo "$HEAP_SUFFIX")
    1.22  
    1.23  # Moscow ML 2.00 or later (experimental!)
    1.24  #ML_SYSTEM=mosml
    1.25 -#ML_HOME=$ISABELLE_HOME/../mosml/bin
    1.26 +#ML_HOME="$ISABELLE_HOME/../mosml/bin"
    1.27  #ML_PLATFORM=""
    1.28  #ML_OPTIONS=""
    1.29  
    1.30  # MLWorks 2.0
    1.31  #ML_SYSTEM=mlworks
    1.32 -#ML_HOME=$ISABELLE_HOME/../mlworks/bin
    1.33 +#ML_HOME="$ISABELLE_HOME/../mlworks/bin"
    1.34  #ML_OPTIONS=""
    1.35  #ML_PLATFORM=""
    1.36  
    1.37 @@ -83,24 +83,23 @@
    1.38  ISABELLE_HOME_USER=~/isabelle
    1.39  
    1.40  # Where to look for isabelle tools (multiple dirs separated by ':').
    1.41 -ISABELLE_TOOLS=$ISABELLE_HOME/lib/Tools
    1.42 +ISABELLE_TOOLS="$ISABELLE_HOME/lib/Tools"
    1.43  
    1.44  # Location for temporary files (should be on a local file system).
    1.45 -ISABELLE_TMP_PREFIX=/tmp/isabelle-$USER
    1.46 +ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
    1.47  
    1.48  
    1.49 -# Heap file locations. ML system identifier appended automatically!
    1.50 +# Heap input locations. ML system identifier is included in lookup.
    1.51 +ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
    1.52  
    1.53 -ISABELLE_PATH=$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps
    1.54 -
    1.55 -#A hack! Isabelle build tells us to store heaps etc. within the
    1.56 -#distribution.
    1.57 +# Heap output location. ML system identifier is appended automatically later on.
    1.58  if [ "$THIS_IS_ISABELLE_BUILD" = true ]; then
    1.59 -  ISABELLE_OUTPUT=$ISABELLE_HOME/heaps
    1.60 -  ISABELLE_BROWSER_INFO=$ISABELLE_HOME/browser_info
    1.61 +  #Isabelle build tells us to store heaps etc. within the distribution.
    1.62 +  ISABELLE_OUTPUT="$ISABELLE_HOME/heaps"
    1.63 +  ISABELLE_BROWSER_INFO="$ISABELLE_HOME/browser_info"
    1.64  else
    1.65 -  ISABELLE_OUTPUT=$ISABELLE_HOME_USER/heaps
    1.66 -  ISABELLE_BROWSER_INFO=$ISABELLE_HOME_USER/browser_info
    1.67 +  ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
    1.68 +  ISABELLE_BROWSER_INFO="$ISABELLE_HOME_USER/browser_info"
    1.69  fi
    1.70  
    1.71  # Site settings check -- just to make it a little bit harder to copy this file!
    1.72 @@ -114,7 +113,7 @@
    1.73  ## Docs
    1.74  
    1.75  #Where to look for docs (multiple dirs separated by ':').
    1.76 -ISABELLE_DOCS=$ISABELLE_HOME/doc
    1.77 +ISABELLE_DOCS="$ISABELLE_HOME/doc"
    1.78  
    1.79  #The dvi file viewer
    1.80  DVI_VIEWER=xdvi
    1.81 @@ -126,7 +125,7 @@
    1.82  ## Fonts -- how to install the Isabelle X11 fonts (can be tricky!).
    1.83  
    1.84  # (1) Get fonts from local (client side) directory:
    1.85 -ISABELLE_INSTALLFONTS="xset fp+ $ISABELLE_HOME/lib/fonts; xset fp rehash"
    1.86 +ISABELLE_INSTALLFONTS="xset fp+ \"$ISABELLE_HOME/lib/fonts\"; xset fp rehash"
    1.87  
    1.88  # (2) Get from font server at Munich or Cambridge:
    1.89  #ISABELLE_INSTALLFONTS="xset fp+ tcp/isafonts.informatik.tu-muenchen.de:7200"
    1.90 @@ -146,13 +145,14 @@
    1.91  
    1.92  # Emacs running Isamode.
    1.93  #ISABELLE_INTERFACE=emacs
    1.94 -ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode
    1.95 +ISAMODE_HOME="$ISABELLE_HOME/contrib/Isamode"
    1.96  ISAMODE_OPTIONS=""
    1.97  
    1.98  # Proof General
    1.99  ISABELLE_INTERFACE=$(choosefrom \
   1.100    "$ISABELLE_HOME/contrib/ProofGeneral/isar/interface" \
   1.101    "$ISABELLE_HOME/../ProofGeneral/isar/interface" \
   1.102 +  "/usr/share/ProofGeneral/isar/interface" \
   1.103    "$ISABELLE_INTERFACE")
   1.104  PROOFGENERAL_OPTIONS=""
   1.105  
   1.106 @@ -160,6 +160,7 @@
   1.107  XSYMBOL_HOME=$(choosefrom \
   1.108    "$ISABELLE_HOME/contrib/x-symbol" \
   1.109    "$ISABELLE_HOME/../x-symbol" \
   1.110 +  "/usr/share/x-symbol" \
   1.111    "")
   1.112  
   1.113