From 161aab582bb3d794414c0275ff8216292f85ab5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Aug 2003 18:24:40 +0000 Subject: [PATCH] * Use a catalog when calling xsltproc. --- doc/manual/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 5bd256658b..63464002be 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -1,21 +1,25 @@ DOCBOOK_DTD = /nix/current/xml/dtd/docbook DOCBOOK_XSL = /nix/current/xml/xsl/docbook +ENV = SGML_CATALOG_FILES=$(DOCBOOK_DTD)/docbook.cat + +XMLLINT = $(ENV) xmllint --catalogs +XSLTPROC = $(ENV) xsltproc --catalogs + SOURCES = book.xml introduction.xml installation.xml nix-reference.xml \ troubleshooting.xml bugs.xml book.is-valid: $(SOURCES) - SGML_CATALOG_FILES=$(DOCBOOK_DTD)/docbook.cat \ - xmllint --catalogs --noout --valid book.xml + $(XMLLINT) --noout --valid book.xml touch $@ man1_MANS = nix.1 fix.1 man nix.1 fix.1: $(SOURCES) book.is-valid - xsltproc $(DOCBOOK_XSL)/manpages/docbook.xsl book.xml + $(XSLTPROC) $(DOCBOOK_XSL)/manpages/docbook.xsl book.xml book.html: $(SOURCES) book.is-valid - xsltproc --output book.html $(DOCBOOK_XSL)/html/docbook.xsl book.xml + $(XSLTPROC) --output book.html $(DOCBOOK_XSL)/html/docbook.xsl book.xml all-local: book.html