From f13a5396182d95e5b98725983779cca010bb313b Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Tue, 21 Sep 2010 15:29:10 +0000 Subject: [PATCH] 1.0.42.51: disable split html manual building Makeinfo tries to generate an overly long filename for one of the split parts (SB-BSD-SOCKETS:SOCKET-MAKE-STREAM, to be exact), breaking the documentation build. Fixes lp#643636. Regression since 1.0.42. --- doc/make-doc.sh | 2 +- doc/manual/Makefile | 4 ++-- version.lisp-expr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/make-doc.sh b/doc/make-doc.sh index 76da726..fe8f261 100644 --- a/doc/make-doc.sh +++ b/doc/make-doc.sh @@ -3,4 +3,4 @@ . ../find-gnumake.sh find_gnumake -(cd ./manual ; $GNUMAKE html) +(cd ./manual ; $GNUMAKE html pdf info) diff --git a/doc/manual/Makefile b/doc/manual/Makefile index ea63f38..2f15a72 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -59,8 +59,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 diff --git a/version.lisp-expr b/version.lisp-expr index 7c64c3e..565db22 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.42.50" +"1.0.42.51" -- 1.7.10.4