docs-common Makefile.common,1.93,1.94

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
${PO2XML} is back!! You need the "kdesdk" RPM after all!! Sorry!!
Evidently, the XML merge mode of xml2po(1) is broken; at least I
could never get it to work reliably.  The worst bug is that it
doesn't handle "&FOO;"-style entities reliably: sometimes they get
substituted, even if the "-k" switch is used and often times they are
simply dropped from the output XML.  Boo!

Using po2xml(1) doesn't fix everything, but it's a step.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile.common	3 Mar 2006 23:20:32 -0000	1.93
+++ Makefile.common	4 Mar 2006 01:28:47 -0000	1.94
@@ -104,6 +104,7 @@
 XMLLINT	=xmllint
 XML2PO	=xml2po
 MSGMERGE=msgmerge
+PO2XML	=po2xml
 LN	=ln
 #########################################################################
 
@@ -411,9 +412,10 @@
 define	XML_template
 $(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po
 	mkdir -p ${1}
-	${XML2PO} -k -p po/${1}.po ${2} >$$@
-endef
-
+#	${XML2PO} -k -p po/${1}.po ${2} >$$@
+	${PO2XML} ${2} po/${1}.po >$$@
+ endef
+ 
 $(foreach L,${OTHERS},							\
 	$(foreach F,${XMLFILES-${PRI_LANG}},				\
 		$(eval $(call XML_template,${L},${F}))))