X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=doc%2FMakefile;h=175cb2514309094ee0ae8fc01308757acb526c58;hb=13635ed2b774e454b90823e085d84aa968da9eb4;hp=6d44a961bf7ee22145112ae8a051fa7c5b8ffde4;hpb=5e5c649eee6b930ddaa756003b24ca3c6326dc4f;p=uffi.git

diff --git a/doc/Makefile b/doc/Makefile
index 6d44a96..175cb25 100644
--- 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
@@ -55,6 +57,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
 
@@ -69,6 +75,7 @@ doc: html pdf
 
 .PHONY: check
 check:
+	@echo "Operating System Detected: ${OS}"
 	@$(CHECK)
 
 .PHONY: html
@@ -77,7 +84,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