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.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/interp/daase.lisp.pamphlet b/src/interp/daase.lisp.pamphlet
index ed192038..8b40ffed 100644
--- a/src/interp/daase.lisp.pamphlet
+++ b/src/interp/daase.lisp.pamphlet
@@ -319,7 +319,7 @@ database.
 (defun asharp (file &optional (flags *asharpflags*))
  "call the asharp compiler"
  (system::system
-   (concatenate 'string (|getEnv| "AXIOM") "/compiler/bin/axiomxl "
+   (concatenate 'string (|systemRootDirectory|) "/compiler/bin/axiomxl "
     flags " " file)))
 
 (defun resethashtables ()
@@ -423,7 +423,7 @@ database.
   |Integer| |List| |OutputForm|))
  (dolist (con constr)
   (let ((c (concatenate 'string
-             (|getEnv| "AXIOM") "/algebra/"
+             (|systemRootDirectory|) "/algebra/"
              (string (getdatabase con 'abbreviation)) ".o")))
     (format t "   preloading ~a.." c)
     (if (probe-file c)
@@ -1247,12 +1247,14 @@ database.
 
 (defun DaaseName (name erase?)
  (let (daase filename)
-  (declare (special $spadroot))
-  (if (setq daase (|getEnv| "DAASE"))
+  (if (setq daase (|systemAlgebraDirectory|))
    (progn
-    (setq filename  (concatenate 'string daase "/algebra/" name))
+    (setq filename  (concatenate 'string daase name))
     (format t "   Using local database ~a.." filename))
-   (setq filename (concatenate 'string $spadroot "/algebra/" name)))
+   (setq filename (concatenate 'string 
+			       (|systemRootDirectory|)
+			       "/algebra/"
+			       name)))
   (when erase? (system::system (concatenate 'string "rm -f " filename)))
   filename))
 
@@ -1792,7 +1794,7 @@ database format.
  (set (foam::axiomxl-file-init-name "filecliq") NOPfuncall)
  (set (foam::axiomxl-file-init-name "attrib") NOPfuncall)
 ;; following needs to happen inside restart since $AXIOM may change
- (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/aldor/lib/")))
+ (let ((asharprootlib (strconc (|systemRootDirectory|) "/aldor/lib/")))
    (set-file-getter (strconc asharprootlib "runtime"))
    (set-file-getter (strconc asharprootlib "lang"))
    (set-file-getter (strconc asharprootlib "attrib"))