docs-common Makefile.common,1.79,1.80

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
Set proper locale before validating XML.  Do a more thourough job
of cleaning up after ourselves.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile.common	28 Feb 2006 21:52:01 -0000	1.79
+++ Makefile.common	1 Mar 2006 00:11:09 -0000	1.80
@@ -256,6 +256,7 @@
 .PHONY:	html-nochunks-${1}
 
 html-nochunks-$(1):: ${DOCBASE}-$(1).html
+
 ${DOCBASE}-$(1).html:: ${XMLFILES-${1}} $(1)/fdp-info.xml set-locale-${1}
 	LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml
 	mv $(DOCBASE).html $(DOCBASE)-$(1).html
@@ -315,8 +316,10 @@
 .PHONY:	pdf-${1}
 
 pdf-$(1):: ${DOCBASE}-$(1).pdf
+
 ${DOCBASE}-$(1).pdf:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
-	LANG=${1}.UTF-8 ${XMLTO} pdf -x $(XSLPDF) $(1)/$(DOCBASE)-$(1).xml
+	LANG=${1}.UTF-8 ${XMLTO} pdf -x $(XSLPDF) $(1)/$(DOCBASE).xml
+	mv -f ${DOCBASE}.pdf ${DOCBASE}-${1}.pdf
 
 distclean::
 	${RM} ${DOCBASE}-${1}.pdf
@@ -338,6 +341,7 @@
 .PHONY: txt-${1} text-${1}
 
 txt-$(1) text-$(1):: ${DOCBASE}-$(1).txt
+
 ${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
 	${XMLLINT} ${XMLLINTOPT} $(1)/$(DOCBASE).xml > $(1)/$(DOCBASE).lint.xml
 	${XSLTPROC} $(FDPDIR)/docs-common/packaging/strip-for-txt.xsl \
@@ -347,6 +351,9 @@
 	mv $(DOCBASE).stripped.txt $(DOCBASE)-$(1).txt
 	rm $(1)/$(DOCBASE).stripped.xml
 
+clean::
+	${RM} ${1}/${DOCBASE}.stripped.xml
+
 distclean::
 	${RM} ${DOCBASE}-${1}.txt
 
@@ -465,6 +472,9 @@
 	@printf ${TFMT} 'po-${1}' 'Creates or updates locale ${1} .PO file'
 	@printf ${TFMT} 'po/${1}.po' 'Creates or updates locale ${1} .PO file'
 
+clean::
+	${RM} .xml2po.mo
+
 endef
 
 $(foreach L,${OTHERS},$(eval $(call PO_template,${L})))
@@ -754,6 +764,7 @@
 LOCALE_ENTITIES='locale-entities.xml'
 define	LOCALE_template
 .PHONY:	set-locale-${1}
+
 set-locale-${1}::
 	${LN} -f -s ${FDPDIR}/docs-common/common/entities/entities-${1}.ent \
 		${LOCALE_ENTITIES}
@@ -774,9 +785,10 @@
 # 'VALIDATE_template' emits rules and targets to validate the XML for the
 # specified ${LANG}
 define	VALIDATE_template
+
 .PHONY:	validate-xml-${1}
 
-validate-xml-${1}: ${XMLFILES-${1}} ${1}/fdp-info.xml
+validate-xml-${1}:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
 	${XMLLINT} --noout --xinclude --postvalid ${1}/${DOCBASE}.xml
 
 help::