From 4b925d483576c960042c5e59b9fba326cc4aecf4 Mon Sep 17 00:00:00 2001
From: Tommy Reynolds <Tommy.Reynolds@MegaCoder.com>
Date: Fri, 3 Mar 2006 19:55:40 +0000
Subject: Added "-k" switch to ${XML2PO} usages to try and keep entity
 references intact.  This doesn't fix the whole problem, but it's a start.

---
 Makefile.common | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index d75f8dd..43b501b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -45,6 +45,12 @@
 sinclude Make.paths
 #########################################################################
 
+#########################################################################
+# Strange though it may seem, some shells do not provide a ${PWD} 
+# environment variable for us.
+PWD	:=$(shell /bin/pwd)
+#########################################################################
+
 #########################################################################
 # Supply default values for the boilerplate files _unless_ the user has
 # provided their own values.
@@ -89,12 +95,6 @@ XMLLINTOPT	=--xinclude --postvalid --noent
 endif
 #########################################################################
 
-#########################################################################
-# Strange though it may seem, some shells do not provide a ${PWD} 
-# environment variable for us.
-PWD	:=$(shell /bin/pwd)
-#########################################################################
-
 #########################################################################
 # Use macros to locate our commonly-used programs
 XMLTO	=xmlto
@@ -112,7 +112,7 @@ LN	=ln
 # from the gnome-doc-utils RPM.
 .SUFFIXES: .po .pot .ent .xml
 %.po:	%.xml
-	${XML2PO} $< >$@
+	${XML2PO} -k $< >$@
 
 %.ent:	%.xml
 	${XSLTPROC} -o $@ --stringparam FDPCOMMONDIR "NONE" \
@@ -394,7 +394,7 @@ clean::
 #########################################################################
 po/${DOCBASE}.pot:: ${XMLFILES-${PRI_LANG}}
 	[ -d po ] || (echo ADD po/ TO CVS >&2; exit 1)
-	${XML2PO} -o $@ $^
+	${XML2PO} -k -o $@ $^
 
 help::
 	@printf ${TFMT} 'po' 'Writes one ${PRI_LANG} PO file for all XML'
@@ -426,7 +426,7 @@ $(foreach L,${OTHERS},$(eval $(call DIR_template,${L})))
 # original ${PRI_LANG} file and an updated po/${LANG}.po file.
 define	XML_template
 $(patsubst ${PRI_LANG}/%,${1}/%,${2}):: ${2} po/${1}.po ${1}
-	${XML2PO} -p po/${1}.po ${2} >$$@
+	${XML2PO} -k -p po/${1}.po ${2} >$$@
 endef
 
 $(foreach L,${OTHERS},							\
@@ -471,12 +471,10 @@ define	PO_template
 
 .PRECIOUS: po/${1}.po
 
-po/${1}.po:: ${XMLFILES-${PRI_LANG}} po/${DOCBASE}.pot
+po/${1}.po:: po/${DOCBASE}.pot
 	[ -d po ] || (echo ADD po/ TO CVS >&2; exit 1)
 	if [ ! -f $$@ ]; then						\
 		cp po/${DOCBASE}.pot $$@;				\
-	else								\
-		${MSGMERGE} -U --backup=simple $$@ po/${DOCBASE}.pot;	\
 	fi
 
 .PHONY:	po-${1}
-- 
cgit