1.1 --- a/build	Tue Mar 11 16:38:53 1997 +0100
     1.2 +++ b/build	Tue Mar 11 16:39:20 1997 +0100
     1.3 @@ -4,26 +4,37 @@
     1.4  #
     1.5  # build - compile parts of the Isabelle system
     1.6  
     1.7 +## args
     1.8  
     1.9 -LOGICS="Pure $*"
    1.10 +LOGICS="$*"
    1.11  
    1.12 -ISATOOL=$PWD/bin/isatool
    1.13  
    1.14 +## settings
    1.15  
    1.16 -## tell the user about current settings
    1.17 +PRG=$(basename $0)
    1.18  
    1.19 -FILES=./etc/settings
    1.20 +ISABELLE_HOME=$(dirname $0)
    1.21 +. $ISABELLE_HOME/lib/scripts/getsettings || \
    1.22 +  { echo "$PRG probably not called from its original place!"; exit 2 }
    1.23  
    1.24 -USER_SETTINGS=$($ISATOOL getenv -b ISABELLE_HOME_USER)/etc/settings
    1.25 -[ -f $USER_SETTINGS ] && FILES="$FILES and $USER_SETTINGS"
    1.26 +
    1.27 +## tell the user about current values
    1.28  
    1.29  echo
    1.30 -echo "Please check $FILES"
    1.31 +echo "Please check $ISABELLE_HOME/etc/settings"
    1.32 +[ -f $ISABELLE_HOME_USER/etc/settings ] && echo "AND $ISABELLE_HOME_USER/etc/settings"
    1.33  echo "to make sure that Isabelle's ML system settings are appropriate."
    1.34  echo "Your current values are:"
    1.35  echo
    1.36  
    1.37 -$ISATOOL getenv ML_SYSTEM ML_HOME ML_OPTIONS
    1.38 +echo "ML_SYSTEM=$ML_SYSTEM"
    1.39 +echo "ML_HOME=$ML_HOME"
    1.40 +echo "ML_OPTIONS=$ML_OPTIONS"
    1.41 +
    1.42 +
    1.43 +## build it
    1.44 +
    1.45 +LOGICS="Pure $DEFAULT_LOGIC $LOGICS"
    1.46  
    1.47  echo
    1.48  echo
    1.49 @@ -31,11 +42,9 @@
    1.50  read
    1.51  
    1.52  
    1.53 -## build it
    1.54 -
    1.55  export THIS_IS_ISABELLE_BUILD=true
    1.56  
    1.57  for DIR in $LOGICS
    1.58  do
    1.59 -  ( cd src/$DIR; $ISATOOL make)
    1.60 +  ( cd $ISABELLE_HOME/src/$DIR; $ISATOOL make)
    1.61  done