aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog7
-rw-r--r--src/algebra/Makefile.in4
-rw-r--r--src/algebra/Makefile.pamphlet4
3 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f6e3e453..e21a79b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
2008-03-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * algebra/Makefile.pamphlet (strap/%.$(FASLEXT)): Don't copy
+ bootstrapping objects to final algebra directory.
+ (%.NRLIB/code.$(FASLEXT)): Specify bootstrapping objects location
+ as option.
+
+2008-03-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* lisp/core.lisp.in ("$faslType"): Export.
* interp/sys-driver.boot (algebraBootstrapDir): New.
* interp/lisplib.boot (findModule): New.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index df0a8551..e0c99be5 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -870,11 +870,11 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
.PRECIOUS: %.NRLIB/code.$(FASLEXT)
%.NRLIB/code.$(FASLEXT): %.spad
@ rm -rf $*.NRLIB
- echo ")co $*.spad" | ${INTERPSYS}
+ echo ")co $*.spad" | ${INTERPSYS} --strap=strap
# Compile bootstrap file to machine object code, and the result
# immediately available for AXIOMsys consumption.
strap/%.$(FASLEXT): %.lsp
- $(COMPILE_LISP) && $(INSTALL) $@ $(OUT)
+ $(COMPILE_LISP)
$(OUTSRC)/%.spad: mk-target-src-algabra-dir
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index abcd635c..ff59f5a5 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1810,14 +1810,14 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
.PRECIOUS: %.NRLIB/code.$(FASLEXT)
%.NRLIB/code.$(FASLEXT): %.spad
@ rm -rf $*.NRLIB
- echo ")co $*.spad" | ${INTERPSYS}
+ echo ")co $*.spad" | ${INTERPSYS} --strap=strap
@
<<genericBOOTSTRAPfiles>>=
# Compile bootstrap file to machine object code, and the result
# immediately available for AXIOMsys consumption.
strap/%.$(FASLEXT): %.lsp
- $(COMPILE_LISP) && $(INSTALL) $@ $(OUT)
+ $(COMPILE_LISP)
@
<<genericSPADfiles>>=