X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2FMakefile;h=45f89eaecb86f60ad688e121292a8ba510a45816;hb=2d237dbc3edb1f6f5337ab19dd74a317e43234db;hp=cce22045e2c615f09c289c8d10abfaf803b6527b;hpb=e583bce51c0f1b1b453b73a4edf3c35d0185e66f;p=sbcl.git

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index cce2204..45f89ea 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -1,12 +1,11 @@
 SBCLTEXI:=sbcl.texinfo
 ASDFTEXI:=asdf.texinfo
 DOCFILES:=*.texinfo $(ASDFTEXI)
-TMPTYPES:=aux cps fns ky log pg toc tps vrs
+TMPTYPES:=aux cp cps fn fns ky log pg toc tp tps vr vrs
 TMPFILES:=$(foreach target,asdf sbcl,$(foreach type,$(TMPTYPES),$(target).$(type)))
 PSFILES=sbcl.ps asdf.ps
 PDFFILES=sbcl.pdf asdf.pdf
 INFOFILES=sbcl.info asdf.info
-VARSFILE=variables.template
 HTMLDIRS=$(basename $(SBCLTEXI)) $(basename $(ASDFTEXI))
 # Place where generated documentation ends up. The value of
 # DOCSTRINGDIR has to end with a slash or you lose (it's passed to
@@ -19,6 +18,13 @@ MODULES=':sb-md5 :sb-rotate-byte :sb-grovel :sb-sprof :sb-bsd-sockets'
 # List of package names that docstring docs will be created for.
 PACKAGES=":COMMON-LISP :SB-ALIEN :SB-DEBUG :SB-EXT :SB-GRAY :SB-MOP :SB-PROFILE :SB-THREAD :SB-MD5 :SB-ROTATE-BYTE :SB-SPROF :SB-BSD-SOCKETS"
 
+# SBCL_SYSTEM is an optional argument to this make program. If this
+# variable is set, its contents are used as the command line for
+# invoking SBCL.
+
+# When passing a non-standard SBCL_SYSTEM, be sure to set the
+# environment variable SBCL_HOME to a useful value, as well.
+
 ifeq ($(MAKEINFO),)
   MAKEINFO:=makeinfo
 endif
@@ -41,14 +47,11 @@ asdf.texinfo:
 	rm -f asdf.texinfo
 	ln -s ../../contrib/asdf/asdf.texinfo
 
-variables: ${VARSFILE}
-	./extract-values.sh < ${VARSFILE} >variables.texinfo
-
 # html documentation; output in $(HTMLDIRS)
 .PHONY: html
 html: html-stamp
 
-html-stamp: variables $(DOCFILES) docstrings
+html-stamp: $(DOCFILES) docstrings
 	@rm -rf $(HTMLDIRS)
 	$(MAKEINFO) $(I_FLAGS) --html $(SBCLTEXI)
 	$(MAKEINFO) --html $(ASDFTEXI)
@@ -62,21 +65,21 @@ ps: $(PSFILES)
 	dvips -o $@ $<
 
 # DVI generation
-%.dvi: %.texinfo variables $(DOCFILES) docstrings
+%.dvi: %.texinfo $(DOCFILES) docstrings
 	texi2dvi $(I_FLAGS) $<
 
 # PDF documentation
 .PHONY: pdf
 pdf: $(PDFFILES)
 
-%.pdf: %.texinfo variables $(DOCFILES) docstrings
+%.pdf: %.texinfo $(DOCFILES) docstrings
 	texi2pdf $(I_FLAGS) $<
 
 # info docfiles
 .PHONY: info
 info: $(INFOFILES)
 
-%.info: %.texinfo variables $(DOCFILES) docstrings
+%.info: %.texinfo $(DOCFILES) docstrings
 	$(MAKEINFO) $(I_FLAGS) $<
 
 # Texinfo docstring snippets
@@ -84,7 +87,7 @@ info: $(INFOFILES)
 docstrings: tempfiles-stamp
 
 tempfiles-stamp:
-	DOCSTRINGDIR=$(DOCSTRINGDIR) PACKAGES=$(PACKAGES) MODULES=$(MODULES) sh make-tempfiles.sh && touch tempfiles-stamp
+	DOCSTRINGDIR=$(DOCSTRINGDIR) PACKAGES=$(PACKAGES) MODULES=$(MODULES) sh make-tempfiles.sh "$(SBCL_SYSTEM)" && touch tempfiles-stamp
 
 
 .PHONY: clean
@@ -93,9 +96,10 @@ clean:
 	rm -rf $(HTMLDIRS) $(DOCSTRINGDIR)
 	rm -f contrib-docs.texi-temp
 	rm -f package-locks.texi-temp
-	rm -f $(PSFILE) $(PDFFILE) $(DVIFILE) html-stamp tempfiles-stamp
-	rm -f $(TMPFILES)
-	rm -f sbcl.info sbcl.info-*
+	rm -f variables.texinfo
+	rm -f $(PSFILES) $(PDFFILES) html-stamp tempfiles-stamp
+	rm -f $(TMPFILES) $(INDEXFILES)
+	rm -f sbcl.info sbcl.info-* asdf.info
 
 .PHONY: distclean
 distclean: clean