docs-common Makefile.common,1.111,1.112

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
Removed the po/${DOC_ENTITIES}.pot rules.  

Now, all translatable strings should be in the "po/${DOC_BASE}.pot" file.  
If you have a "po/${DOC_ENTITIES}.pot" file, DELETE IT YOURSELF
because we will just ignore it from now on ;-)

Replaced the XML2PO "-k" (keep entities) switch with the "-e" (expand
all entities) because "-k" was the default behavior.  Maybe we'll
like this better.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Makefile.common	24 Apr 2006 01:52:18 -0000	1.111
+++ Makefile.common	27 Apr 2006 20:20:27 -0000	1.112
@@ -63,6 +63,7 @@
 HTMLCSS		= ${FDPDIR}/docs-common/css/fedora-draft.css
 endif
 ifeq	"${DRAFT}" ""
+#DRAFT	= no
 DRAFT	= yes
 endif
 ifeq	"${PRI_LANG}" ""
@@ -93,6 +94,7 @@
 XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
 XMLLINT	=xmllint
 XML2PO	=xml2po
+XML2POFLAGS=-e
 MSGMERGE=msgmerge
 LN	=ln
 MEINPROC=meinproc
@@ -105,9 +107,9 @@
 #########################################################################
 # Rules to produce .po files from .xml files.  Get the tools to do this
 # from the gnome-doc-utils RPM.
-.SUFFIXES: .po .pot .ent .xml
+.SUFFIXES: .po .pot .fo .ent .xml
 %.po:	%.xml
-	${XML2PO} -k $< >$@
+	${XML2PO} ${XML2POFLAGS} $< >$@
 
 %.ent:	%.xml
 	${XSLTPROC} -o $@ --stringparam FDPCOMMONDIR "NONE" \
@@ -223,29 +225,30 @@
 # Rules to generate the "${LANG}/${DOC_ENTITIES}.ent" file, if used
 define DOC_ENTITIES_template
 
-po/${DOC_ENTITIES}.pot:: ${1}/${FDP_ENTITIES} ${PRI_LANG}/${DOC_ENTITIES}.xml
-	${XML2PO} -o $$@ -k ${PRI_LANG}/${DOC_ENTITIES}.xml
-clean::
-	${RM} po/${DOC_ENTITIES}.pot
-
-help::
-	@printf ${TFMT} 'po/${DOC_ENTITIES}.pot' 'Create .POT file for per-doc entities'
-
-po/${1}.po:: ${1}/${FDP_ENTITIES} po/${DOC_ENTITIES}.pot
-	if [ ! -f $$@ ]; then						\
-		mkdir -p ${1};						\
-		cp -f po/${DOC_ENTITIES}.pot $$@;			\
-	fi
-	${MSGMERGE} -U -q $$@ po/${DOC_ENTITIES}.pot
-	touch $$@
+#po/${DOC_ENTITIES}.pot:: ${1}/${FDP_ENTITIES} ${PRI_LANG}/${DOC_ENTITIES}.xml
+#	${XML2PO} -o $$@ ${XML2POFLAGS} ${PRI_LANG}/${DOC_ENTITIES}.xml
+#clean::
+#	${RM} po/${DOC_ENTITIES}.pot
+#
+#help::
+#	@printf ${TFMT} 'po/${DOC_ENTITIES}.pot' 'Create .POT file for per-doc entities'
+
+#po/${1}.po:: ${1}/${FDP_ENTITIES} po/${DOC_ENTITIES}.pot
+#	if [ ! -f $$@ ]; then						\
+#		mkdir -p ${1};						\
+#		cp -f po/${DOC_ENTITIES}.pot $$@;			\
+#	fi
+#	${MSGMERGE} -U -q $$@ po/${DOC_ENTITIES}.pot
+#	touch $$@
 
 ${1}/${DOC_ENTITIES}.xml:: ${1}/${FDP_ENTITIES} po/${1}.po ${PRI_LANG}/${DOC_ENTITIES}.xml
-	${XML2PO} -p po/${1}.po ${PRI_LANG}/${DOC_ENTITIES}.xml >$$@
+	${XML2PO} ${XML2POFLAGS} -p po/${1}.po 				\
+		${PRI_LANG}/${DOC_ENTITIES}.xml >$$@
 
 clean::
 	${RM} ${1}/${DOC_ENTITIES}.xml
 
-# ${1}/${DOC_ENTITIES}.ent::  ${1}/${DOC_ENTITIES}.xml
+${1}/${DOC_ENTITIES}.ent::  ${1}/${DOC_ENTITIES}.xml
 
 help::
 	@printf ${TFMT} '${1}/${DOC_ENTITIES}.ent' 'Per-doc entities for locale "${1}"'
@@ -265,12 +268,12 @@
 #########################################################################
 
 #########################################################################
-po/${DOCBASE}.pot:: ${DOC_ENTITIES_ENT-${PRI_LANG}} 			\
+po/${DOCBASE}.pot:: ${DOC_ENTITIES_XML-${PRI_LANG}} 			\
 		${PRI_LANG}/${FDP_ENTITIES} ${XMLFILES-${PRI_LANG}}
 	[ -d po/CVS ] || (echo ADD po/ TO CVS >&2; exit 1)
-	${XML2PO} -k -o $@ ${XMLFILES-${PRI_LANG}}
+	${XML2PO} ${XML2POFLAGS} -o $@ ${XMLFILES-${PRI_LANG}} ${DOC_ENTITIES_XML-${PRI_LANG}}
 help::
-	@printf ${TFMT} 'po/${DOCBASE}.pot' 'Writes one PO file for all XML'
+	@printf ${TFMT} 'po/${DOCBASE}.pot' 'Writes one POT file for all XML'
 
 .PHONY:	pot
 pot::	po/${DOCBASE}.pot
@@ -322,7 +325,7 @@
 		${DOC_ENTITIES_ENT-${1}}
 	mkdir -p ${1}
 	ln -s -f ../${2} $$@.in
-	cd po && ${XML2PO} -e -p ${1}.po ../$$@.in >../$$@
+	cd po && ${XML2PO} ${XML2POFLAGS} -p ${1}.po ../$$@.in >../$$@
 	${RM} $$@.in
 endef
 
@@ -386,7 +389,7 @@
 	mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
 	cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
-ifeq	"${DRAFT}" "yes"
+ifneq	"${DRAFT}" "no"
 	cp ${FDPDIR}/docs-common/images/watermark-$(1).png 		\
 		$(DOCBASE)-$(1)/watermark.png
 endif
@@ -422,7 +425,7 @@
 	mkdir -p stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
 	cp ${HTMLCSS} fedora.css
-ifeq	"${DRAFT}" "yes"
+ifneq	"${DRAFT}" "no"
 	cp ${FDPDIR}/docs-common/images/watermark-$(1).png watermark.png
 endif
 
@@ -476,7 +479,9 @@
 fo-${1}:: ${1}/${DOCBASE}.fo
 ${1}/${DOCBASE}.fo:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
 	LANG=${1}.UTF-8 xsltproc --xinclude 			\
-	     --stringparam FDPDIR ${FDPDIR}			\
+	     --stringparam FDPDIR  ${FDPDIR}			\
+	     --stringparam IMGROOT ${PWD}			\
+	     --stringparam RENDEREDBY fop-0.20.5		\
 	     ${XSLPDF} ${1}/${DOCBASE}.xml | ${XMLLINT} --format -o $$@ -
 clean::
 	${RM} ${1}/${DOCBASE}.fo