--- gcl/makefile.old	Tue Jun  4 16:14:51 2002
+++ gcl/makefile	Tue Jun  4 16:57:50 2002
@@ -130,6 +130,8 @@
 LSPDIR	= lsp
 CMPDIR	= cmpnew
 PORTDIR	= unixport
+CLCSDIR = clcs
+PCLDIR = pcl
 MPDIR	= mp
 GMP_DIR = gmp/
 
@@ -141,6 +143,8 @@
 	(cd $(LSPDIR); make all)
 	(cd $(CMPDIR); make all)
 	(cd $(PORTDIR); make saved_gcl)
+	(cd $(PCLDIR); make compile; make saved_gcl)
+	(cd $(CLCSDIR); make saved_gcl)
 	make command
 
 # 	After making successfully send in a notification to
@@ -230,6 +234,7 @@
 	(cd $(PORTDIR); make clean)
 	(cd gcl-tk ; make clean)
 	-(cd gmp ; make distclean)
+	(cd clcs ; make clean)
 	(cd info ; make clean)
 	rm -f foo.tcl config.log makedefs makedefsafter config.cache config.status makedefc
 	rm -f h/config.h h/gclincl.h h/cmpinclude.h
--- gcl/clcs/makefile.old	Tue Jun  4 16:15:23 2002
+++ gcl/clcs/makefile	Tue Jun  4 16:56:56 2002
@@ -1,7 +1,13 @@
 
 LISP=../unixport/saved_gcl
 compile: ${LISP}
-	echo '(jamei-load-lcs :compile)' | ${LISP}
+	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compile)' | ${LISP}
+
+saved_gcl: ${LISP}
+	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compile)(system::save-system "saved_gcl")' | ${LISP}
+	mv saved_gcl ../unixport/saved_gcl
+clean:
+	rm -f *.o
 
 # begin makedefs
 
--- pcl-gcl-2.1/makefile.gcl	Fri Apr 28 19:56:12 1995
+++ gcl/pcl/makefile.gcl	Tue Jun  4 19:16:50 2002
@@ -5,7 +5,7 @@
 # make -f makefile.gcl saved_pcl
 
 
-LISP=gcl
+LISP=../unixport/saved_gcl
 
 
 SETUP='(load "sys-package.lisp")' \
@@ -18,8 +18,9 @@
 compile:
 	echo ${SETUP} '(pcl::compile-pcl)' | ${LISP}
 
-saved_pcl:
-	echo ${SETUP} '(pcl::load-pcl)(si::save-system "saved_pcl")' | ${LISP}
+saved_gcl:
+	echo ${SETUP} '(pcl::load-pcl)(si::save-system "saved_gcl")' | ${LISP}
+	mv saved_gcl ../unixport/saved_gcl
 
 
 # remake the sys-package.lisp and sys-proclaim.lisp files