gencgc: code_page_p() must die!

[sbcl.git] / doc / manual / Makefile

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 9986cb9..7b80ca9 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -12,13 +12,15 @@ HTMLFILES=sbcl.html asdf.html
 # DOCSTRINGDIR has to end with a slash or you lose (it's passed to
 # Lisp's `pathname' function).
 DOCSTRINGDIR="docstrings/"
-CONTRIBDIR="../../contrib/"
-I_FLAGS=-I $(DOCSTRINGDIR) -I $(CONTRIBDIR)
+CONTRIB_SRC_DIR="../../contrib/"
+CONTRIB_OBJ_DIR="../../obj/asdf-cache/"
+I_FLAGS=-I $(DOCSTRINGDIR) -I $(CONTRIB_SRC_DIR)
 # List of contrib modules that docstring docs will be created for.
 MODULES=':sb-md5 :sb-queue :sb-concurrency :sb-rotate-byte :sb-grovel \
          :sb-sprof :sb-bsd-sockets :sb-cover :sb-posix'
 # 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-PCL :SB-SYS :SB-SEQUENCE \
           :SB-PROFILE :SB-THREAD :SB-MD5 :SB-QUEUE :SB-ROTATE-BYTE  \
           :SB-SPROF :SB-BSD-SOCKETS :SB-COVER :SB-POSIX :SB-CONCURRENCY"
 
@@ -58,8 +60,8 @@ html: html-stamp
 html-stamp: $(DOCFILES) docstrings
        @rm -rf $(HTMLDIRS)
        @rm -f $(HTMLFILES)
-       $(MAKEINFO) $(I_FLAGS) --html --css-include=style-multi.css $(SBCLTEXI)
-       $(MAKEINFO) --html --css-include=style-multi.css $(ASDFTEXI)
+#      $(MAKEINFO) $(I_FLAGS) --html --css-include=style-multi.css $(SBCLTEXI)
+#      $(MAKEINFO) --html --css-include=style-multi.css $(ASDFTEXI)
        $(MAKEINFO) $(I_FLAGS) --html --no-split --css-include=style-single.css $(SBCLTEXI)
        $(MAKEINFO) --html --no-split --css-include=style-single.css $(ASDFTEXI)
        touch html-stamp
@@ -92,11 +94,11 @@ info: $(INFOFILES)
 # Texinfo docstring snippets
 # Note: assumes contrib module names are the same as the names of
 # directories containing the modules, and that these directories
-# are in $(CONTRIBDIR).
-CONTRIB_FASLS=$(shell find $(shell echo $(MODULES) | sed "s|:|$(CONTRIBDIR)|g") -name '*.fasl')
+# are in $(CONTRIB_OBJ_DIR).
+CONTRIB_FASLS=$(shell find $(shell echo $(MODULES) | sed "s|:|$(CONTRIB_OBJ_DIR)|g") -name '*.fasl')
 docstrings: $(CONTRIB_FASLS) tempfiles-stamp
        for module in $(shell echo $(MODULES)); do \
-               test -e $(CONTRIBDIR)/$${module#:}/test-passed \
+               test -f $(CONTRIB_OBJ_DIR)/`echo $$module | tr -d :`/test-passed.test-report \
                || { echo "The documented contrib $$module seems \
                            to have failed its tests." && exit 1; } \
        done
@@ -109,7 +111,7 @@ tempfiles-stamp:
        touch tempfiles-stamp
 
 .PHONY: clean
-clean: 
+clean:
        rm -f *~ *.bak *.orig \#*\# .\#* texput.log *.fasl
        rm -rf $(HTMLDIRS) $(DOCSTRINGDIR)
        rm -f  $(HTMLFILES)