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, 5 insertions, 19 deletions

diff --git a/Makefile.pamphlet b/Makefile.pamphlet
index 5596cc2d..ea55f2a3 100644
--- a/Makefile.pamphlet
+++ b/Makefile.pamphlet
@@ -396,20 +396,6 @@ of its file information. See the [[YEARWEEK]] variable in the
 [[src/interp/Makefile.pamphlet]] and the [[yearweek]] function in 
 [[src/interp/util.lisp.pamphlet]].
 
-\subsubsection{SPAD}
-The [[SPAD]] variable is normally specified in the environment. 
-It is expected to be a path to the top level directory of the
-shipped system. For example, if we want to build a linux system
-the [[SPAD]] variable should look like:
-
-    `pwd`/target/i686-pc-linux
-
-\subsubsection{SYS}
-From the [[SPAD]] variable we look at the last directory name
-and create a version of OpenAxiom for that system. The [[SYS]]
-environment variable is the last directory name in the [[SPAD]]
-variable.
-
 \subsubsection{AXIOM\_X11\_CFLAGS}
 
 The variable [[AXIOM_X11_CFLAGS]] holds the C compiler flags necessary
@@ -575,11 +561,11 @@ $(addprefix $(axiom_build_bindir)/, notangle noweave): maybe-cp-noweb-srcdir
 <<install>>=
 install:
 	@echo Installing OpenAxiom in $(prefix)
-	@mkdir -p $(DESTDIR)$(libdir)/open-axiom
-	@cp -pr $(builddir)/target $(DESTDIR)$(libdir)/open-axiom
-	@ rm -f $(bindir)/axiom
-	@ $(mkinstalldirs) $(bindir)
-	@ $(INSTALL_PROGRAM) src/scripts/axiom $(bindir)
+	@$(mkinstalldirs) $(DESTDIR)$(open_axiom_installdir)
+	cp -pr $(builddir)/$(target)/* $(DESTDIR)$(open_axiom_installdir)
+	rm -f $(bindir)/axiom
+	@$(mkinstalldirs) $(bindir)
+	$(INSTALL_PROGRAM) src/scripts/axiom $(bindir)
 	@echo OpenAxiom installation finished.
 @