From a02f0965d8da367bbf739dc8a7cb8628210d3cf1 Mon Sep 17 00:00:00 2001
From: Andreas Fuchs <asf@boinkor.net>
Date: Sun, 9 Jan 2005 12:33:31 +0000
Subject: [PATCH] 0.8.18.23:         Manual build fixes.

        * Allow the manual to be built with an sbcl in a non-standard
          place.  This is supposed to help the autobuilder/benchmarker
          build a manual without jumping through too many hoops.
        * Add a docstring to sb-md5's md5sum-string, to make the
          manual happy again.
---
 contrib/sb-md5/md5.lisp      |    4 ++++
 doc/manual/Makefile          |    9 ++++++++-
 doc/manual/make-tempfiles.sh |   17 +++++++++++------
 version.lisp-expr            |    2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/contrib/sb-md5/md5.lisp b/contrib/sb-md5/md5.lisp
index 8563c8a..12515fb 100644
--- a/contrib/sb-md5/md5.lisp
+++ b/contrib/sb-md5/md5.lisp
@@ -536,6 +536,10 @@ in SEQUENCE , which must be a vector with element-type (UNSIGNED-BYTE
     (finalize-md5-state state)))
 
 (defun md5sum-string (string &key (external-format :default) (start 0) end)
+  "Calculate the MD5 message-digest of the binary representation
+of STRING (as octets) in EXTERNAL-FORMAT. The boundaries START
+and END refer to character positions in the string, not to octets
+in the resulting binary representation."
   (declare (optimize (speed 3) (space 0) (debug 0))
            (type string string))
   (md5sum-sequence
diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index c0c41cd..f1bbce0 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -18,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
@@ -80,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
diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
index d2dc7cd..dc7a6c7 100644
--- a/doc/manual/make-tempfiles.sh
+++ b/doc/manual/make-tempfiles.sh
@@ -13,15 +13,20 @@
 
 # We create the documentation from the in-tree sbcl if it is found,
 # else an installed sbcl is used.
-sbclsystem=`pwd`/../../src/runtime/sbcl
-sbclcore=`pwd`/../../output/sbcl.core
 
-if [ -e $sbclsystem ] && [ -e $sbclcore ] 
+if [ -z "$1" ]
 then
-    SBCLRUNTIME="${1:-$sbclsystem --core $sbclcore}"
-    export SBCL_HOME=`pwd`/../../contrib
+    sbclsystem=`pwd`/../../src/runtime/sbcl
+    sbclcore=`pwd`/../../output/sbcl.core
+    if [ -e $sbclsystem ] && [ -e $sbclcore ]
+    then
+        SBCLRUNTIME="$sbclsystem --core $sbclcore"
+        SBCL_HOME=`pwd`/../../contrib; export SBCL_HOME
+    else
+        SBCLRUNTIME="`which sbcl`"
+    fi
 else
-    SBCLRUNTIME="${1:-`which sbcl`}"
+    SBCLRUNTIME="$1"
 fi
 
 SBCL="$SBCLRUNTIME --noinform --sysinit /dev/null --userinit /dev/null --noprint --disable-debugger"
diff --git a/version.lisp-expr b/version.lisp-expr
index 2a73f6a..2c11ea5 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".)
-"0.8.18.22"
+"0.8.18.23"
-- 
1.7.10.4