From a03b7716749e9fb997d99659967aa49ae6ca1569 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 7 Mar 2011 05:49:53 +0000
Subject: 	* interp/sys-utility.boot (getSystemModulePath): Use 
 systemAlgebraDirectory. 	* interp/database.boot (pathToDatabase): Use
 systemDatabaseDirectory. 	* algebra/integer.spad.pamphlet (Integer)
 [latex]: Tidy. 	* algebra/string.spad.pamphlet (Character) [latex]:
 Likewise. 	* algebra/Makefile.in: Rework bootstrapping set up. 
 (COMPILE_LISP): Remove. 	(axiom_algebra_layer_strap): Likewise. 
 (axiom_algebra_layer_strap_objects): Likewise. 
 (axiom_algebra_bootstrap): Likewise. 	(oa_strap_0_fasls): New. 
 (oa_strap_1_fasls): Likewise. 	(oa_strap_2_fasls): Likewise. 
 (oa_strap_0_sources): Likewise. 	(oa_strap_1_sources): Likewise. 
 (oa_strap_2_sources): Likewise. 	* src/algerab/strap: Remove.

---
 src/interp/Makefile.in      | 2 +-
 src/interp/database.boot    | 2 +-
 src/interp/sys-utility.boot | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 8934bad6..c751e8d3 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -243,7 +243,7 @@ ${SAVESYS}: database.date \
 	$(DRIVER) --execpath=$(BOOTSYS) \
 		--syslib=$(axiom_target_libdir) \
 		--system="$(AXIOM)/" --system-algebra \
-		--sysalg="$(axiom_src_datadir)/algebra/" \
+		--sysdb="$(axiom_src_datadir)/algebra/" \
 		--prologue="(pushnew :open-axiom-basic-system *features*)" \
 		--make --output=$@ --main="BOOT::|systemMain|" \
 		--load-directory=. $(OBJS) makeint.$(LNKEXT)
diff --git a/src/interp/database.boot b/src/interp/database.boot
index cf823270..3e4077a9 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -46,7 +46,7 @@ $globalExposureGroupAlist := []
 --% 
 
 pathToDatabase name ==
-  if dbdir := systemAlgebraDirectory() then
+  if dbdir := systemDatabaseDirectory() then
     path := strconc(dbdir,name)
     if $verbose then
       FORMAT(true,'"   Using local database ~a..",path)
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 499739b5..ec35299a 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -227,6 +227,7 @@ checkMkdir path ==
 
 ++ return the pathname to the system module designated by `m'.
 getSystemModulePath m ==
+  d := systemAlgebraDirectory() => strconc(d,m,'".",$faslType)
   strconc(systemRootDirectory(),'"algebra/",m,'".",$faslType)
 
 ++ load module in `path' that supposedly will define the function 
-- 
cgit v1.2.3