docs-common Makefile.common,1.88,1.89

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
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.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.common	2 Mar 2006 22:01:34 -0000	1.88
+++ Makefile.common	3 Mar 2006 19:55:40 -0000	1.89
@@ -46,6 +46,12 @@
 #########################################################################
 
 #########################################################################
+# 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.
 ifeq	"${FDPDIR}" ""
@@ -90,12 +96,6 @@
 #########################################################################
 
 #########################################################################
-# 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
 XSLTPROC=xsltproc
@@ -112,7 +112,7 @@
 # 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 @@
 #########################################################################
 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 @@
 # 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 @@
 
 .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}