r9457: Reworked CLSQL file structure.

[clsql.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index b1dfa5e6f5a019036eec19a21c3b4ffa6b48fb23..f31c755d79675d9bc9747b41f07a59707628422a 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -21,9 +21,9 @@ DOCFILE_EXT_DEFAULT:=xml
 
 # Standard docfile processing
 
-DEBIAN=expr "`cat /etc/issue`" : '.*Debian.*'
-SUSE=expr "`cat /etc/issue`" : '.*SuSE.*'
-REDHAT=expr "`cat /etc/issue`" : '.*RedHat.*'
+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
@@ -56,6 +56,10 @@ 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
 
@@ -70,6 +74,7 @@ doc: html pdf
 
 .PHONY: check
 check:
+       @echo "Operating system detected: ${OS}"
        @$(CHECK)
 
 .PHONY: html
@@ -78,7 +83,8 @@ html: html.tar.gz
 html.tar.gz: $(DOCFILES) Makefile 
        @rm -rf html
        @mkdir html
-       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output html/ html_chunk.xsl $(DOCFILE)
+       @XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --stringparam chunker.output.encoding ISO-8859-1 \
+                --xinclude --output html/ html_chunk.xsl $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo