docs-common Makefile.common,1.129,1.130

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	Makefile.common 
Log Message:
This change temporarily breaks building but will improve translation
overall.  The rpm-info.xml should no longer contain any translations,
and should now be stored in the original language directory.  It will
still be used to generate fdp-info.xml, and we will probably also
strip RPM information out of the DTD since we intend to use a standard
specfile for this purpose from here on out.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- Makefile.common	4 Aug 2006 02:57:12 -0000	1.129
+++ Makefile.common	5 Aug 2006 03:50:51 -0000	1.130
@@ -102,7 +102,7 @@
 PRI_LANG= en
 endif
 ifeq	"${RPMINFO}" ""
-RPMINFO		= ${PWD}/rpm-info.xml
+RPMINFO		= rpm-info.xml
 endif
 ifeq	"${RPMPREP}" ""
 RPMPREP=yes
@@ -684,12 +684,38 @@
 #########################################################################
 
 #########################################################################
+# The "${LANG}/rpm-info.xml" file contains the revision information for
+# the original DocBook source.  We use it to generate the "fdp-info.xml"
+# file discussed in the next section.
+#
+define rpm-info_template
+${1}/${RPMINFO}::  po/${1}.po ${PRI_LANG}/${RPMINFO}
+	mkdir -p ${1}
+	${XML2PO} ${XML2POFLAGS} -p po/${1}.po				\
+		${PRI_LANG}/${RPMINFO} >$$@
+
+clean::
+	${RM} ${1}/${RPMINFO}
+
+help::
+	@printf ${TFMT} '${1}/${RPMINFO}' 'Make translated document revision info'
+endef
+
+# ${PRI_LANG}/${RPMINFO} must exist, only generate for OTHERS
+$(foreach L,${OTHERS},$(eval $(call rpm-info_template,${L})))
+# Make sure rpm-info is part of the document PO template
+$(foreach L,${LANGUAGES},$(eval XMLFILES-${L}+=${L}/${RPMINFO}))
+#
+#########################################################################
+
+
+#########################################################################
 # The "${LANG}/fdp-info.xml" file contains the <articleinfo> or 
 # <bookinfo> stanza.  It is automatically generated from data in the
 # "rpm-info.xml" file whenever that file changes.
 #
 define fdp-info_template
-$(1)/fdp-info.xml::	$(RPMINFO)
+$(1)/fdp-info.xml::	${1}/$(RPMINFO)
 	mkdir -p ${1}
 	LANG=$(1).UTF-8 ${XSLTPROC} --stringparam lang $(1)		\
 		--stringparam fdpdir $(FDPDIR)				\
@@ -697,7 +723,7 @@
 			doctype ${PRI_LANG}/$(DOCBASE).xml)		\
 		--stringparam legalbase ${LEGALNOTICEBASE}		\
 		${FDPDIR}/docs-common/packaging/bookinfo.xsl 		\
-		$(RPMINFO) 					| 	\
+		${1}/$(RPMINFO) 				| 	\
 	$(XMLFORMAT) $(XMLFOPTS) >$$@
 
 clean::