0.8.6.1:

	* clean.sh: Allow recursive includes in src/runtime/Config
	* doc/*: Convert from SGML format and processing to XML
	Currently, catalogs are in place for Debian and RedHat which
	allow automated use of local files instead of the tools
	downloading DTDs and XSLs from their canonical URLs.
	I'm glad to help setup catalogs for other operating systems.

Author: kevinrosenberg

clean.sh

@@ -22,6 +22,10 @@ rm -rf obj/* output/* doc/user-manual \
 # distribution, we automatically clean up after it here in the 
 # standard clean.sh file.)
 
+# Ensure we know GNUMAKE
+. find-gnumake.sh
+find_gnumake
+
 # Ask some other directories to clean themselves up.
 original_pwd=`pwd`
 for d in tools-for-build; do
@@ -31,7 +35,7 @@ for d in tools-for-build; do
     # this script is just the operations done by these make's, which
     # is misleading when this script does lotso other operations too.
     # -- WHN
-    make -s clean
+    $GNUMAKE -I ../src/runtime -s clean
     cd $original_pwd  > /dev/null
 done
 

doc/Makefile

@@ -0,0 +1,113 @@
+DOCFILE_BASE_DEFAULT:=user-manual
+DOCFILE_EXT_DEFAULT:=xml
+
+
+# Standard docfile processing
+
+DEBIAN=$(shell expr "`cat /etc/issue`" : '.*Debian.*')
+SUSE=$(shell expr "`cat /etc/issue`" : '.*SuSE.*')
+REDHAT=$(shell expr "`cat /etc/issue`" : '.*RedHat.*')
+
+
+ifneq (${DEBIAN},0)
+OS:=debian
+else
+  ifneq (${SUSE},0)
+    OS=suse
+  else   
+    ifneq (${REDHAT},0)
+      OS=redhat
+    endif
+  endif
+endif
+
+
+ifndef DOCFILE_BASE
+DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
+endif
+
+ifndef DOCFILE_EXT
+DOCFILE_EXT=${DOCFILE_EXT_DEFAULT}
+endif
+
+DOCFILE:=${DOCFILE_BASE}.${DOCFILE_EXT}
+FOFILE:=${DOCFILE_BASE}.fo
+PDFFILE:=${DOCFILE_BASE}.pdf
+PSFILE:=${DOCFILE_BASE}.ps
+DVIFILE:=${DOCFILE_BASE}.dvi
+TXTFILE:=${DOCFILE_BASE}.txt
+HTMLFILE:=${DOCFILE_BASE}.html
+TMPFILES:=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
+DOCFILES:=$(shell echo *.xml *.xsl)
+
+ifeq ($(XSLTPROC),)
+  XSLTPROC:=xsltproc
+endif
+
+CATALOG:=`pwd`/catalog-${OS}.xml
+CHECK:=XML_CATALOG_FILES="$(CATALOG)" xmllint --noout --xinclude --postvalid $(DOCFILE) || exit 1
+
+.PHONY: all
+all: html pdf 
+
+.PHONY: dist
+dist: html pdf
+
+.PHONY: doc
+doc: html pdf
+
+.PHONY: check
+check:
+	@echo "Operating system detected: ${OS}"
+	@$(CHECK)
+
+.PHONY: html
+html: html-stamp
+
+html-stamp: $(DOCFILES) Makefile 
+	@rm -rf html
+	@mkdir html
+	@XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --stringparam chunker.output.encoding ISO-8859-1 \
+		 --xinclude --output html/ html_chunk.xsl $(DOCFILE)
+	touch html-stamp
+
+.PHONY: fo
+fo: ${FOFILE}
+
+${FOFILE}: $(DOCFILES) Makefile 
+	@XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --xinclude --output $(FOFILE) fo.xsl $(DOCFILE)
+
+.PHONY: pdf
+pdf: ${PDFFILE}
+
+${PDFFILE}: ${DOCFILES} Makefile
+	@$(MAKE) fo
+	@fop $(FOFILE) -pdf $(PDFFILE) > /dev/null
+
+.PHONY: dvi
+dvi: ${DVIFILE}
+
+.PHONY: ps
+ps: ${PSFILE}
+
+${PSFILE}: ${DOCFILES} Makefile
+	@$(MAKE) fo
+	@fop $(FOFILE) -ps $(PSFILE) > /dev/null
+
+
+.PHONY: txt
+txt: ${TXTFILE}
+
+${TXTFILE}: ${FOFILE}
+	@XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --xinclude --output ${HTMLFILE} html.xsl $(DOCFILE)
+	lynx -dump ${HTMLFILE} > ${TXTFILE}
+
+.PHONY: clean
+clean: 
+	@rm -f *~ *.bak *.orig \#*\# .\#* texput.log
+	@rm -rf html ${PSFILE} ${HTMLFILE} html-stamp
+	@rm -f ${TMPFILES} ${FOFILE}
+	@rm -f  ${DVIFILE} ${TXTFILE}
+
+.PHONY: distclean
+distclean: clean