* Makefile.pamphlet (database.$(FASLEXT)): New rule.

	* database.boot.pamphlet: Push into package "BOOT".

4 files changed, 23 insertions, 17 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index f74f3000..7be876a1 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (database.$(FASLEXT)): New rule.
+	* database.boot.pamphlet: Push into package "BOOT".
+
 2007-11-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (functor.$(FASLEXT)): New rule.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 97fac659..21e0258b 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -457,6 +457,10 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
+		cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -688,10 +692,6 @@ compiler.clisp: compiler.boot
 	@ echo 233 making $@ from $<
 	@ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
 
-database.clisp: database.boot
-	@ echo 243 making $@ from $<
-	@ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
-
 i-analy.clisp: i-analy.boot
 	@ echo 280 making $@ from $<
 	@ echo '(old-boot::boot "i-analy.boot")' | ${DEPSYS}
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 69abbb73..2f69125e 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1108,14 +1108,6 @@ compiler.clisp: compiler.boot
 	@ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
 @
 
-\subsection{database.boot \cite{67}}
-
-<<database.clisp>>=
-database.clisp: database.boot
-	@ echo 243 making $@ from $<
-	@ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
-@
-
 \subsection{i-analy.boot}
 
 <<i-analy.clisp>>=
@@ -1556,6 +1548,10 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
+		cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -1767,8 +1763,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<compiler.clisp>>
 
-<<database.clisp>>
-
 <<i-analy.clisp>>
 
 <<i-code.clisp>>
diff --git a/src/interp/database.boot.pamphlet b/src/interp/database.boot.pamphlet
index f33d9333..03c15cd2 100644
--- a/src/interp/database.boot.pamphlet
+++ b/src/interp/database.boot.pamphlet
@@ -50,7 +50,14 @@
 <<*>>=
 <<license>>
 
-SETANDFILEQ($getUnexposedOperations,true)
+import '"nlib"
+import '"g-cndata"
+import '"clam"
+import '"cattable"
+import '"compat"
+)package "BOOT"
+
+$getUnexposedOperations := true
 
 --% Functions for manipulating MODEMAP DATABASE
 
@@ -258,7 +265,7 @@ orderPredTran(oldList,sig,skip) ==
   for pred in newList repeat
     if pred is ['isDomain,x,y] or x is ['ofCategory,x,y] then
       ids:= listOfPatternIds y
-      if and/[id in fullDependList for id in ids] then
+      if "and"/[id in fullDependList for id in ids] then
 	fullDependList:= insertWOC(x,fullDependList)
       fullDependList:= UNIONQ(fullDependList,ids)
 
@@ -271,7 +278,7 @@ orderPredTran(oldList,sig,skip) ==
 --pp answer
 
 isDomainSubst u == main where
-  main ==
+  main() ==
     u is [head,:tail] =>
       nhead :=
 	head is ['isDomain,x,y] => ['isDomain,x,fn(y,tail)]