2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>

	* configure.ac.pamphlet: Tidy.  Don't instantiate src/lisp/core.lisp.
	* configure.ac: Regenerate.
	* configure: Likewise.
	* config/var-def.mk (open_axiom_installdir): New.
	(AXIOM): Support versioning.
	* Makefile.pamphlet (install): Tidy.
	Remove sections on SPAD and SYS variables.
	* Makefile.in: Regenerate.

src/algebra/
2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (INTERPSYS): Now take system root directory
	and algebra directory as arguments.
	* Makefile.in: Regenerate.

src/etc/
2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (INTERPSYS): Take system root directory and
	algebra directory as arguments.
	* Makefile.in: Regenerate.

src/interp/
2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* bookvol5.pamphlet (initroot): Use |systemRootDirectory| instead
	of environment variable AXIOM.
	(|loadExposureGroupData|): Likewise.
	* br-data.boot.pamphlet (dbHasExamplePage): Likewise.
	(dbRead): Likewise.
	(dbReadComments): Likewise.
	(buildGloss): Likewise.
	* br-saturn.boot.pamphlet (getSaturnExampleList): Likewise.
	* br-search.boot.pamphlet (grepSplit): Likewise.
	* daase.lisp.pamphlet (asharp): Likewise.
	(initial-getdatabase): Likewise.
	(DaaseName): Likewise.
	(create-initializers): Likewise.
	* ht-root.boot.pamphlet (htGlossPage): Likewise.
	* htcheck.boot.pamphlet (buildHtMacroTable): Likewise.
	* i-syscmd.boot.pamphlet (summary): Likewise.
	(copyright): Likewise.
	* patches.lisp.pamphlet (restart0): Likewise.
	* util.lisp.pamphlet (sourcepath): Likewise.
	* Makefile.pamphlet (OBJS): Include sys-driver.$(FASLEXT).
	(${SAVESYS}): Tidy.
	(${AXIOMSYS}): Likewise.
	(${DEPSYS}): Depend on sys-driver.$(FASLEXT).  Load it.
	(sys-driver.$(FASLEXT)): New rule.
	* Makefile.in: Regenerate.
	* sys-driver.boot: New.

src/lisp/
2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* core.lisp.in (|%systemOptions|): New.
	(|%systemArguments|): Likewise.
	(|$systemInstallationDirectory|): Likewise.
	(|$sysOpts|): Likewise.
	(|$sysArgs|): Likewise.
	(|handleCommandLine|): Tidy.
	(|printUsage|): Update.
	* Makefile.pamphlet (core.lisp): Instantiate here.

src/script/
2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* axiom.in (AXIOM): Use value substituted by Autoconf.
	Remove dead code.

2 files changed, 14 insertions, 32 deletions

diff --git a/src/scripts/ChangeLog b/src/scripts/ChangeLog
index 86419485..736bb6a2 100644
--- a/src/scripts/ChangeLog
+++ b/src/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* axiom.in (AXIOM): Use value substituted by Autoconf.
+	Remove dead code.
+
 2007-09-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* document.in (TANGLE): New environment variable.  Use in place
diff --git a/src/scripts/axiom.in b/src/scripts/axiom.in
index 29d896bb..1fda6803 100644
--- a/src/scripts/axiom.in
+++ b/src/scripts/axiom.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Start everything for Axiom.
+# Start everything for OpenAxiom.
 #
 # axiom
 #      [-ht   |-noht]	    whether to use HyperDoc
@@ -23,13 +23,13 @@
 #
 #
 
-## Where The Axiom system resides
+## Where The OpenAxiom system resides
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-AXIOM=@libdir@/open-axiom/target/@target@
+AXIOM=@open_axiom_installdir@
 export AXIOM
 
-## We adjust the value of PATH here because, currently, some Axiom 
+## We adjust the value of PATH here because, currently, some OpenAxiom 
 ## programs are called from the executing shell, and relying on the 
 ## fact that the executables are reachable from the PATH.
 PATH=$AXIOM/bin:$PATH
@@ -88,29 +88,6 @@ if [ "$*" = "-h" ] ; then
      showuse
 fi
 
-if [ "$SPAD" = "" ] ; then
-  if [ "$AXIOM" = "" ] ; then
-    echo "AXIOM variable is not set"
-    exit 1
-  else
-    SPAD=$AXIOM
-  fi
-  export SPAD
-else
-  if [ "$AXIOM" = "" ] ; then
-    echo "AXIOM variable is not set"
-    echo "but SPAD = $SPAD"
-    echo "Using AXIOM = $SPAD"
-    AXIOM=$SPAD
-    export AXIOM
-  else
-    if [ ! "$SPAD" = "$AXIOM" ] ; then
-       echo "ignoring SPAD variable"
-       SPAD=$AXIOM
-    fi
-  fi
-fi
-
 if [ "$AXIOMXLROOT" = "" ] ; then 
 AXIOMXLROOT=${AXIOM}/compiler
 fi
@@ -120,13 +97,13 @@ export PATH
 
 
 
-if [ ! -d "$SPAD" ] ; then
-  echo "The directory for Axiom, $SPAD, does not exist."
+if [ ! -d "$AXIOM" ] ; then
+  echo "The directory for OpenAxiom, $AXIOM, does not exist."
   ciao
 fi
 
 # Name the workspace directories.
-rootwsdir=$SPAD/bin
+rootwsdir=$AXIOM/bin
 
 # 2. Process command line arguments.
 
@@ -204,12 +181,12 @@ fi
 
 if [ $go = no ] ; then
 	echo "Would now start the processes."
-	echo exec $SPAD/bin/sman $otheropts -ws $serverws
+	echo exec $AXIOM/bin/sman $otheropts -ws $serverws
 	exit 0
 fi
 
 if [ $use_sman = "yes" ]; then
-    exec $SPAD/bin/sman $otheropts -ws $serverws
+    exec $AXIOM/bin/sman $otheropts -ws $serverws
 else
     exec $serverws
 fi