From f1138cf115183a304e923bc2c78d22af855d94e5 Mon Sep 17 00:00:00 2001
From: Tommy Reynolds <Tommy.Reynolds@MegaCoder.com>
Date: Sat, 4 Mar 2006 01:28:47 +0000
Subject: ${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.
---
 Makefile.common | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 557b51f..4bc4801 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -104,6 +104,7 @@ XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
 XMLLINT	=xmllint
 XML2PO	=xml2po
 MSGMERGE=msgmerge
+PO2XML	=po2xml
 LN	=ln
 #########################################################################
 
@@ -411,9 +412,10 @@ pot::	po/${DOCBASE}.pot
 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}))))
-- 
cgit