docs-common Makefile.common,1.176,1.177

Sat Sep 15 21:48:05 UTC 2007

Author: pfrields

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23228

Modified Files:
	Makefile.common 
Log Message:
Add capability for per-module options for xmlto



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177

--- Makefile.common	7 Sep 2007 17:48:22 -0000	1.176
+++ Makefile.common	15 Sep 2007 21:48:03 -0000	1.177
@@ -597,8 +597,8 @@
 .PHONY:	html-${1}
 html-$(1):: ${DOCBASE}-$(1)/index.html
 ${DOCBASE}-$(1)/index.html::  ${XMLFILES-${1}} ${XMLDEPFILES-${1}}
-	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) \
-		$(1)/$(DOCBASE).xml
+	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) ${XMLTOOPTS} \
+		-o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml
 	mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
 	cp ${FDPCOMMONDIR}/stylesheet-images/*.png \
 		$(DOCBASE)-$(1)/stylesheet-images
@@ -635,7 +635,7 @@
 
 ${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}}
 	LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) \
-		$(1)/$(DOCBASE).xml
+		${XMLTOOPTS} $(1)/$(DOCBASE).xml
 	mv $(DOCBASE).html $(DOCBASE)-$(1).html
 	mkdir -p stylesheet-images/
 	cp ${FDPCOMMONDIR}/stylesheet-images/*.png stylesheet-images/
@@ -718,7 +718,7 @@
 pdf-$(1):: ${DOCBASE}-$(1).pdf
 
 ${DOCBASE}-${1}.pdf:: ${1}/${DOCBASE}.fo
-	LANG=${1}.UTF-8 ${XMLTO} -o ${1} pdf $$<
+	LANG=${1}.UTF-8 ${XMLTO} ${XMLTOOPTS} -o ${1} pdf $$<
 	mv -f ${1}/${DOCBASE}.pdf $$@
 
 distclean::
@@ -747,7 +747,7 @@
 	${XSLTPROC} $(FDPCOMMONDIR)/packaging/strip-for-txt.xsl \
 		$(1)/$(DOCBASE).lint.xml > $(1)/$(DOCBASE).stripped.xml
 	rm $(1)/$(DOCBASE).lint.xml
-	LANG=$(1).UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt \
+	LANG=$(1).UTF-8 ${XMLTO} ${XMLTOOPTS} ${XMLTOTXTPOSTOPT} txt \
 		$(1)/$(DOCBASE).stripped.xml
 	mv $(DOCBASE).stripped.txt $(DOCBASE)-$(1).txt
 	rm $(1)/$(DOCBASE).stripped.xml


