--- Makefile.orig	2010-05-28 10:09:35.000000000 +0000
+++ Makefile	2010-06-17 17:24:37.000000000 +0000
@@ -14,10 +14,10 @@
 #GCLVERSION=gcl-2.6.6
 #GCLVERSION=gcl-2.6.7pre
 #GCLVERSION=gcl-2.6.7
-#GCLVERSION=gcl-2.6.8pre
+GCLVERSION=gcl-2.6.8pre
 #GCLVERSION=gcl-2.6.8pre2
 #GCLVERSION=gcl-2.6.8pre3 
-GCLVERSION=gcl-2.6.8pre4
+#GCLVERSION=gcl-2.6.8pre4
 AWK:=gawk
 GCLDIR:=${LSP}/${GCLVERSION}
 SRC:=${SPD}/src
@@ -35,7 +35,7 @@
 DOCUMENT:=${SPADBIN}/document
 TANGLE:=${SPADBIN}/lib/notangle
 WEAVE:=${SPADBIN}/lib/noweave
-NOISE:="-o ${TMP}/trace"
+NOISE:=-o ${TMP}/trace
 PATCH:=patch
 UNCOMPRESS:=gunzip
 
@@ -46,7 +46,7 @@
 ENV:= SPAD=${SPAD} SYS=${SYS} SPD=${SPD} LSP=${LSP} GCLDIR=${GCLDIR} \
      SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
      SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
-     SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
+     SUBPART=${SUBPART} NOISE="${NOISE}" GCLVERSION=${GCLVERSION} \
      TANGLE=${TANGLE} VERSION=${VERSION} PATCH=${PATCH} DOCUMENT=${DOCUMENT} \
      WEAVE=${WEAVE} UNCOMPRESS=${UNCOMPRESS} BOOKS=${BOOKS}
 
@@ -60,16 +60,16 @@
 	@ cp Makefile.dvi ${MNT}/${SYS}/doc/src/root.Makefile.dvi
 	@ echo p2 starting parallel make of books
 	@ echo p3 ${SPD}/books/Makefile from ${SPD}/books/Makefile.pamphlet
-	@ ( cd ${SPD}/books ; \
-           ${DOCUMENT} ${NOISE} Makefile ; \
-           cp Makefile.dvi ${MNT}/${SYS}/doc/src/books.Makefile.dvi ; \
-	   ${ENV} ${MAKE} & )
+	@( cd ${SPD}/books && \
+           ${DOCUMENT} ${NOISE} Makefile && \
+           cp Makefile.dvi ${MNT}/${SYS}/doc/src/books.Makefile.dvi && \
+	   ${ENV} ${MAKE} )
 	@ echo p4 starting parallel make of input documents
-	@ ${ENV} ${MAKE} parallelinput ${NOISE} &
+	@ ${ENV} ${MAKE} parallelinput ${NOISE} 
 	@ echo p5 starting parallel make of xhtml documents
-	@ ${ENV} ${MAKE} parallelxhtml ${NOISE} &
+	@ ${ENV} ${MAKE} parallelxhtml ${NOISE} 
 	@ echo p6 starting parallel make of help
-	@ ${ENV} $(MAKE) parallelhelp ${NOISE} &
+	@ ${ENV} $(MAKE) parallelhelp ${NOISE} 
 	@ echo p7 starting parallel make of src
 	@ ${ENV} $(MAKE) -f Makefile.${SYS} 
 	@ echo 3 finished system build on `date` | tee >lastBuildDate
--- Makefile.pamphlet.orig	2010-05-28 10:09:35.000000000 +0000
+++ Makefile.pamphlet	2010-06-17 17:29:54.000000000 +0000
@@ -45,16 +45,16 @@
 	@ cp Makefile.dvi ${MNT}/${SYS}/doc/src/root.Makefile.dvi
 	@ echo p2 starting parallel make of books
 	@ echo p3 ${SPD}/books/Makefile from ${SPD}/books/Makefile.pamphlet
-	@ ( cd ${SPD}/books ; \
-           ${DOCUMENT} ${NOISE} Makefile ; \
-           cp Makefile.dvi ${MNT}/${SYS}/doc/src/books.Makefile.dvi ; \
-	   ${ENV} ${MAKE} & )
+	@( cd ${SPD}/books && \
+           ${DOCUMENT} ${NOISE} Makefile && \
+           cp Makefile.dvi ${MNT}/${SYS}/doc/src/books.Makefile.dvi && \
+	   ${ENV} ${MAKE} )
 	@ echo p4 starting parallel make of input documents
-	@ ${ENV} ${MAKE} parallelinput ${NOISE} &
+	@ ${ENV} ${MAKE} parallelinput ${NOISE} 
 	@ echo p5 starting parallel make of xhtml documents
-	@ ${ENV} ${MAKE} parallelxhtml ${NOISE} &
+	@ ${ENV} ${MAKE} parallelxhtml ${NOISE} 
 	@ echo p6 starting parallel make of help
-	@ ${ENV} $(MAKE) parallelhelp ${NOISE} &
+	@ ${ENV} $(MAKE) parallelhelp ${NOISE} 
 	@ echo p7 starting parallel make of src
 	@ ${ENV} $(MAKE) -f Makefile.${SYS} 
 	@ echo 3 finished system build on `date` | tee >lastBuildDate
@@ -288,7 +288,7 @@
 \end{verbatim}
 with the default value of NOISE being:
 \begin{verbatim}
-   NOISE="-o ${TMP}/trace"
+   NOISE=-o ${TMP}/trace
 \end{verbatim}
 
 The reason NOISE exists is that the latex command will
@@ -372,7 +372,7 @@
 DOCUMENT:=${SPADBIN}/document
 TANGLE:=${SPADBIN}/lib/notangle
 WEAVE:=${SPADBIN}/lib/noweave
-NOISE:="-o ${TMP}/trace"
+NOISE:=-o ${TMP}/trace
 PATCH:=patch
 UNCOMPRESS:=gunzip
 
@@ -381,7 +381,7 @@
 ENV:= SPAD=${SPAD} SYS=${SYS} SPD=${SPD} LSP=${LSP} GCLDIR=${GCLDIR} \
      SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
      SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
-     SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
+     SUBPART=${SUBPART} NOISE="${NOISE}" GCLVERSION=${GCLVERSION} \
      TANGLE=${TANGLE} VERSION=${VERSION} PATCH=${PATCH} DOCUMENT=${DOCUMENT} \
      WEAVE=${WEAVE} UNCOMPRESS=${UNCOMPRESS} BOOKS=${BOOKS}
 
@@ -807,10 +807,10 @@
 #GCLVERSION=gcl-2.6.6
 #GCLVERSION=gcl-2.6.7pre
 #GCLVERSION=gcl-2.6.7
-#GCLVERSION=gcl-2.6.8pre
+GCLVERSION=gcl-2.6.8pre
 #GCLVERSION=gcl-2.6.8pre2
 #GCLVERSION=gcl-2.6.8pre3 
-GCLVERSION=gcl-2.6.8pre4
+#GCLVERSION=gcl-2.6.8pre4
 @
 
 \subsubsection{The [[GCLOPTS]] configure variable}
@@ -869,7 +869,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -916,7 +916,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -963,7 +963,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1010,7 +1010,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1057,7 +1057,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1104,7 +1104,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1150,7 +1150,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1203,7 +1203,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1257,7 +1257,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
 PATCH=patch
@@ -1365,7 +1365,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1427,7 +1427,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1474,7 +1474,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1521,7 +1521,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1759,7 +1759,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-CUSTRELOC>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1801,7 +1801,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1867,7 +1867,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1944,7 +1944,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -1996,7 +1996,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2044,7 +2044,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2092,7 +2092,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2139,7 +2139,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2191,7 +2191,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-LOCBFD>>
 <<SRCDIRS>>
 PATCH=gpatch
@@ -2238,7 +2238,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2285,7 +2285,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2332,7 +2332,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2379,7 +2379,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2427,7 +2427,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2474,7 +2474,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2522,7 +2522,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2569,7 +2569,7 @@
 LISP=lisp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS>>
 <<SRCDIRS>>
 PATCH=patch
@@ -2633,7 +2633,7 @@
 LISP=lsp
 DAASE=${SRC}/share
 # where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
 <<GCLOPTS-CUSTRELOC>>
 <<SRCDIRS>>
 PATCH=patch
--- ./src/algebra/Makefile.pamphlet.orig	2010-05-28 10:09:36.000000000 +0000
+++ ./src/algebra/Makefile.pamphlet	2010-06-17 17:24:06.000000000 +0000
@@ -17577,7 +17577,7 @@
 	  else \
 	   echo '(progn (in-package (quote boot)) (compile-file "$*.lsp" :output-file "$*.o"))' | ${DEPSYS} >${TMP}/trace ; \
 	  fi )
-	@ cp ${MID}/$*.o ${OUT}/$*.o
+	@ mkdir -p $$(dirname $(OUT)/$*.o) && cp ${MID}/$*.o ${OUT}/$*.o
 
 @
 <<genericSPADfiles>>=
--- ./src/input/monitortest.input.pamphlet.orig	2010-06-17 17:23:58.000000000 +0000
+++ ./src/input/monitortest.input.pamphlet	2010-06-17 17:24:06.000000000 +0000
@@ -355,10 +355,11 @@
 
 \end{chunk}{*}
 
+\begin{chunk}{*}
 )spool 
 )lisp (bye)
  
-\end{chunk}
+\end{chunk}{*}
 \eject
 \begin{thebibliography}{99}
 \bibitem{1} nothing
