X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=doc%2FMakefile;fp=doc%2FMakefile;h=55a743f798c5026d9aa19f2248f393ff0f674275;hb=466148daa2e13a529e7338aeaf83cdc49c47ddbb;hp=9a7e131e0e6801774234a1efb5bc4d2dafb7afa3;hpb=3df27abdd8edebdba22689f3100955d1603aa618;p=uffi.git

diff --git a/doc/Makefile b/doc/Makefile
index 9a7e131..55a743f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,9 +15,9 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ##############################################################################
 
-
-DOCFILE_BASE_DEFAULT=uffi
-DOCFILE_EXT_DEFAULT=xml
+OS:=debian
+DOCFILE_BASE_DEFAULT:=uffi
+DOCFILE_EXT_DEFAULT:=xml
 
 # Standard docfile processing
 
@@ -36,9 +36,10 @@ PSFILE:=${DOCFILE_BASE}.ps
 DVIFILE:=${DOCFILE_BASE}.dvi
 TXTFILE:=${DOCFILE_BASE}.txt
 TMPFILES:=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
-DOCFILES:=$(shell echo *.xml)
+DOCFILES:=$(shell echo *.xml *.xsl)
 
-CHECK:=xmllint --noout --catalogs --xinclude --postvalid $(DOCFILE) || exit 1
+CATALOG:=`pwd`/catalog-${OS}.xml
+CHECK:=XML_CATALOG_FILES="$(CATALOG)" xmllint --noout --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all
 all: html pdf 
@@ -56,16 +57,17 @@ check:
 .PHONY: html
 html: html.tar.gz
 
-html.tar.gz: $(DOCFILES) Makefile check
+html.tar.gz: $(DOCFILES) Makefile 
 	@rm -rf html
-	@xmlto --skip-validation -o html xhtml $(DOCFILE)
+	@mkdir html
+	@XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output html/ html.xsl $(DOCFILE)
 	@GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo
 fo: ${FOFILE}
 
-${FOFILE}: $(DOCFILES) Makefile check
-	@xmlto --skip-validation fo $(DOCFILE)
+${FOFILE}: $(DOCFILES) Makefile 
+	@XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output $(FOFILE) fo.xsl $(DOCFILE)
 
 .PHONY: pdf
 pdf: ${PDFFILE}