From 85858b85b1fcf9f115ab3286f6e3c9cbf06cbb3d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 19 Aug 2007 20:47:19 +0000
Subject: 	* boot-pkg.lisp: New.

	* Makefile.pamphlet (${DEPSYS}): Depend on it
	(parsing.$(FASLEXT)): Likewise.
	(bookvol5.$(FASLEXT)): Likewise.
	(nocompil.$(FASLEXT)): Likewise.
	(bootfuns.$(FASLEXT)): Likewise.
	(boot-pkg.$(FASLEXT)): New rule.
	(boot-pkg.lisp): New rule; work around GCL+VPATH voodoo.
	(VPATH): Clear.
	* Makefile.in: Regenerate.

	* bootfuns.lisp.pamphlet: Don't define package "BOOT" here.
	Import "boot-pkg".
	(|printLoadMessages|): Move to setvart.boot.pamphlet.
	Move special functions to boot-pkg.lisp.
	Move get-current-directory to daase.lisp.pamphlet.

	* setvart.boot.pamphlet (printLoadMessages): Move from
	bootfuns.lisp.pamphlet. Write as Boot code.

	* daase.lisp.pamphlet (get-current-directory): Move from
        bootfuns.lisp.pamphlet
---
 src/interp/Makefile.pamphlet | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/interp/Makefile.pamphlet')

diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 1785de68..e20283fe 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -983,11 +983,15 @@ depsys_objects = nocompil.$(FASLEXT) bookvol5.$(FASLEXT) g-error.$(FASLEXT) \
 		fnewmeta.$(FASLEXT) clam.$(FASLEXT) \
 		slam.$(FASLEXT) g-boot.$(FASLEXT) c-util.$(FASLEXT) \
 		g-util.$(FASLEXT)
+VPATH =
+
+
 
 ${DEPSYS}:	vmlisp.$(FASLEXT) \
 		hash.$(FASLEXT) \
 		ggreater.$(FASLEXT) \
 		union.$(FASLEXT) \
+		boot-pkg.$(FASLEXT) \
 		bootfuns.$(FASLEXT) \
 		${DEP} \
 		nocompil.$(FASLEXT) \
@@ -1059,16 +1063,19 @@ ${DEPSYS}:	vmlisp.$(FASLEXT) \
 util.$(FASLEXT): util.lisp parsing.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-parsing.$(FASLEXT): parsing.lisp bootfuns.$(FASLEXT)
+parsing.$(FASLEXT): parsing.lisp boot-pkg.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+bookvol5.$(FASLEXT): bookvol5.lisp boot-pkg.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-bookvol5.$(FASLEXT): bookvol5.lisp bootfuns.$(FASLEXT)
+nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-nocompil.$(FASLEXT): nocompil.lisp bootfuns.$(FASLEXT)
+bootfuns.$(FASLEXT): bootfuns.lisp hash.$(FASLEXT) boot-pkg.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
-bootfuns.$(FASLEXT): bootfuns.lisp hash.$(FASLEXT)
+boot-pkg.$(FASLEXT): boot-pkg.lisp vmlisp.$(FASLEXT)
 	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
 hash.$(FASLEXT): hash.lisp vmlisp.$(FASLEXT)
@@ -1083,6 +1090,16 @@ ggreater.$(FASLEXT): ggreater.lisp vmlisp.$(FASLEXT)
 vmlisp.$(FASLEXT): vmlisp.lisp
 	$(BOOTSYS) -- --compile --output=$@ $<
 
+
+## GCL-2.6.8pre has the following behaviour that it will
+## try to forcefully put the compiled code in the same directory
+## as the source.  This is hardly what we want, especially when
+## the source file reside in non-writeable areas.  Consequently,
+## we copy the source file to the current working directory --
+## until we find a better way to convince GCL to do the right thing.
+boot-pkg.lisp: $(srcdir)/boot-pkg.lisp
+	cp $< $@
+
 @
 
 \section{Building SAVESYS and AXIOMSYS}
-- 
cgit v1.2.3