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, 15 insertions, 7 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 66f21c7e..f7a4099e 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -49,7 +49,7 @@ SAVESYS= interpsys$(EXEEXT)
 AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT)
 
 OBJS=	vmlisp.$(FASLEXT)	hash.$(FASLEXT)	\
-	diagnostics.$(FASLEXT)				\
+	diagnostics.$(FASLEXT)	sys-driver.$(FASLEXT) \
 	macros.$(FASLEXT)	\
 	unlisp.$(FASLEXT)	setq.$(FASLEXT)	\
 	astr.$(FASLEXT)	bits.$(FASLEXT)	\
@@ -308,9 +308,10 @@ makeint.lisp:	${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
 	@ echo '(gbc t)' >> makeint.lisp
 
 ${SAVESYS}: makeint.lisp
-	AXIOM="$(AXIOM)" DAASE="$(axiom_src_datadir)" \
-		$(LOADSYS) -- --make --output=$@ --main="BOOT::RESTART" \
-			 --load-directory=. makeint.lisp
+	$(LOADSYS) -- --system="$(AXIOM)/" \
+		--sysalg="$(axiom_src_datadir)/algebra/" \
+		--make --output=$@ --main="BOOT::RESTART" \
+		--load-directory=. makeint.lisp
 	@ echo 6 ${SAVESYS} created
 	$(mkinstalldirs) $(axiom_target_bindir)
 depsys_lisp_sources += parsing.lisp metalex.lisp bootlex.lisp \
@@ -339,6 +340,7 @@ ${DEPSYS}:	vmlisp.$(FASLEXT) \
 		boot-pkg.$(FASLEXT) \
 		sys-constants.$(FASLEXT) \
 		sys-globals.$(FASLEXT) \
+		sys-driver.$(FASLEXT) \
 		diagnostics.$(FASLEXT) \
 		sys-macros.$(FASLEXT) \
 		macros.$(FASLEXT) \
@@ -366,6 +368,7 @@ ${DEPSYS}:	vmlisp.$(FASLEXT) \
 	@ echo 3 making ${DEPSYS} 
 	@ rm -f makedep.lisp
 	@ $(mkinstalldirs) $(axiom_build_bindir)
+	@ echo '(|importModule| "sys-driver")' >> makedep.lisp
 	@ echo '(|importModule| "vmlisp")' >> makedep.lisp
 	@ echo '(|importModule| "bits")' >> makedep.lisp
 	@ echo '(|importModule| "hash")' >> makedep.lisp
@@ -422,9 +425,11 @@ nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT)
 all-axiomsys: ${AXIOMSYS}
 
 ${AXIOMSYS}: makeint.lisp
-	AXIOM="$(AXIOM)" DAASE="$(axiom_targetdir)" \
-		$(LOADSYS) -- --make --output=$@ --main="BOOT::RESTART" \
-			--load-directory=. makeint.lisp
+	$(LOADSYS) -- \
+		--system="$(AXIOM)/" \
+		--sysalg="$(axiom_targetdir)/algebra/" \
+		--make --output=$@ --main="BOOT::RESTART" \
+		--load-directory=. makeint.lisp
 	@ echo 6a ${AXIOMSYS} created
 exposed.lsp: $(axiom_src_algdir)/exposed.lsp.pamphlet
 	@ echo 615 making exposed.lsp from $(axiom_src_algdir)/exposed.lsp.pamphlet
@@ -556,6 +561,9 @@ diagnostics.$(FASLEXT): diagnostics.boot sys-constants.$(FASLEXT) \
 				sys-globals.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
+sys-driver.$(FASLEXT): sys-driver.boot boot-pkg.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
 sys-globals.$(FASLEXT): sys-globals.boot sys-constants.$(FASLEXT) \
 				hash.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<