r8252: fix encoding

[uffi.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index 6d44a961bf7ee22145112ae8a051fa7c5b8ffde4..dd7e2570f72e85a9f0146a2aca68d7def9abf01b 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -21,9 +21,10 @@ 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
@@ -37,6 +38,7 @@ else
   endif
 endif
 
+
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
 endif
@@ -69,6 +71,7 @@ doc: html pdf
 
 .PHONY: check
 check:
+       @echo "Operating System Detected: ${OS}"
        @$(CHECK)
 
 .PHONY: html
@@ -77,7 +80,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