Stupid %.ent:%.xml form didn't allow for additional dependancies and the

.ent file may not be regenerated when necesssary.  This has been fixed
by adding a template.  All hail the template!

3 files changed, 74 insertions, 82 deletions

diff --git a/common/entities/Makefile b/common/entities/Makefile
index d146271..bcff8f2 100644
--- a/common/entities/Makefile
+++ b/common/entities/Makefile
@@ -1,5 +1,5 @@
 PRI_LANG=en_US
-OTHERS =en it pt_BR ru zh_CN
+OTHERS =de en it pt_BR ru zh_CN
 
 #######################################################################
 # PLEASE:
@@ -25,16 +25,6 @@ ENTFILES=$(foreach L,${PRI_LANG} ${OTHERS},entities-${L}.ent)
 #######################################################################
 
 #######################################################################
-# Rule: Apply stylesheet to transform XML into locale-specific ".ent" 
-# entities file
-#
-%.ent:	%.xml
-	xsltproc -o $@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
-		entities.xsl $<
-#
-#######################################################################
-
-#######################################################################
 # Printf(1) format string for describing targets by "make help".
 HELPFMT	="%-23s\t| %s.\n"
 #
@@ -63,7 +53,7 @@ help::
 #######################################################################
 
 #######################################################################
-# Target 'entities.pot' makes a TEMPORARY seed translation file.  We
+# Target 'entities.pot' makes a seed translation file.  We
 # use the original-language entities XML file as the source.
 #
 .PHONY:	pot
@@ -71,6 +61,9 @@ help::
 pot entities.pot:: entities-${PRI_LANG}.xml
 	xml2po -o entities.pot $<
 
+distclean::
+	${RM} entities.pot
+
 help::
 	@printf ${HELPFMT} "make pot" 		"Create template PO file"
 	@printf ${HELPFMT} "make entities.pot" 	"Create template PO file"
@@ -174,19 +167,16 @@ distclean clobber:: clean
 	${RM} ${ENTFILES}
 
 help::
-	@printf ${HELPFMT} "make distclean"	"Delete all generated files"
-	@printf ${HELPFMT} "make clobber"	"Delete all generated files"
+	@printf ${HELPFMT} "make distclean" "Delete all generated files"
+	@printf ${HELPFMT} "make clobber"   "Delete all generated files"
 #
 #######################################################################
 
 #######################################################################
-# We create EXACTLY one .POT file, and treat is as a temporary file.
-# Do NOT EDIT the .POT file if you are sharing this directory!
-#
-entities.pot:: entities-${PRI_LANG}.xml
-	xml2po -o $@ $<
-
-help::
-	@printf ${HELPFMT} "make entities.pot"	"Create template .PO file"
-#
+define	ENT_template
+entities-${1}.ent::	entities-${1}.xml entities.pot
+	xsltproc -o @$@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
+		entities.xsl entities-${1}.xml
+endef
+$(foreach L,${PRI_LANG} ${OTHERS},$(eval $(call ENT_template,${L})))
 #######################################################################
diff --git a/common/entities/de.po b/common/entities/de.po
index 6c8255b..dd1fc07 100644
--- a/common/entities/de.po
+++ b/common/entities/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-01 16:48-0500\n"
+"POT-Creation-Date: 2006-03-02 16:52-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9,224 +9,226 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: entities-en_US.xml:6(title) 
-msgid "These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names."
+#: entities-en_US.xml:4(title)
+msgid ""
+"These common entities are useful shorthand terms and names, which may be "
+"subject to change at anytime. This is an important value the the entity "
+"provides: a single location to update terms and common names."
 msgstr ""
 
-#: entities-en_US.xml:14(comment) entities-en_US.xml:18(comment) 
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
 msgid "Generic root term"
 msgstr ""
 
-#: entities-en_US.xml:15(text) 
+#: entities-en_US.xml:8(text)
 msgid "Fedora"
 msgstr ""
 
-#: entities-en_US.xml:19(text) 
+#: entities-en_US.xml:12(text)
 msgid "Core"
 msgstr ""
 
-#: entities-en_US.xml:22(comment) 
+#: entities-en_US.xml:15(comment)
 msgid "Generic main project name"
 msgstr ""
 
-#: entities-en_US.xml:26(comment) 
+#: entities-en_US.xml:19(comment)
 msgid "Legacy Entity"
 msgstr ""
 
-#: entities-en_US.xml:30(comment) 
+#: entities-en_US.xml:23(comment)
 msgid "Short project name"
 msgstr ""
 
-#: entities-en_US.xml:31(text) 
+#: entities-en_US.xml:24(text)
 msgid "FC"
 msgstr ""
 
-#: entities-en_US.xml:34(comment) 
+#: entities-en_US.xml:27(comment)
 msgid "Generic overall project name"
 msgstr ""
 
-#: entities-en_US.xml:35(text) 
+#: entities-en_US.xml:28(text)
 msgid "<use entity=\"FED\"/> Project"
 msgstr ""
 
-#: entities-en_US.xml:38(comment) 
+#: entities-en_US.xml:31(comment)
 msgid "Generic docs project name"
 msgstr ""
 
-#: entities-en_US.xml:39(text) entities-en_US.xml:43(text) 
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr ""
 
-#: entities-en_US.xml:42(comment) 
+#: entities-en_US.xml:35(comment)
 msgid "Short docs project name"
 msgstr ""
 
-#: entities-en_US.xml:46(comment) 
+#: entities-en_US.xml:39(comment)
 msgid "cf. Core"
 msgstr ""
 
-#: entities-en_US.xml:47(text) 
+#: entities-en_US.xml:40(text)
 msgid "Extras"
 msgstr ""
 
-#: entities-en_US.xml:50(comment) 
+#: entities-en_US.xml:43(comment)
 msgid "cf. Fedora Core"
 msgstr ""
 
-#: entities-en_US.xml:54(comment) 
+#: entities-en_US.xml:47(comment)
 msgid "Fedora Docs Project URL"
 msgstr ""
 
-#: entities-en_US.xml:58(comment) 
+#: entities-en_US.xml:51(comment)
 msgid "Fedora Project URL"
 msgstr ""
 
-#: entities-en_US.xml:62(comment) 
+#: entities-en_US.xml:55(comment)
 msgid "Fedora Documentation (repository) URL"
 msgstr ""
 
-#: entities-en_US.xml:66(comment) entities-en_US.xml:67(text) 
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
 msgid "Bugzilla"
 msgstr ""
 
-#: entities-en_US.xml:70(comment) 
+#: entities-en_US.xml:63(comment)
 msgid "Bugzilla URL"
 msgstr ""
 
-#: entities-en_US.xml:74(comment) 
+#: entities-en_US.xml:67(comment)
 msgid "Bugzilla product for Fedora Docs"
 msgstr ""
 
-#: entities-en_US.xml:75(text) 
+#: entities-en_US.xml:68(text)
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr ""
 
-#: entities-en_US.xml:80(comment) 
+#: entities-en_US.xml:73(comment)
 msgid "Current release version of main project"
 msgstr ""
 
-#: entities-en_US.xml:81(text) 
+#: entities-en_US.xml:74(text)
 msgid "4"
 msgstr ""
 
-#: entities-en_US.xml:84(comment) 
+#: entities-en_US.xml:77(comment)
 msgid "Current test number of main project"
 msgstr ""
 
-#: entities-en_US.xml:85(text) 
+#: entities-en_US.xml:78(text)
 msgid "test3"
 msgstr ""
 
-#: entities-en_US.xml:88(comment) 
+#: entities-en_US.xml:81(comment)
 msgid "Current test version of main project"
 msgstr ""
 
-#: entities-en_US.xml:89(text) 
+#: entities-en_US.xml:82(text)
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr ""
 
-#: entities-en_US.xml:94(comment) 
+#: entities-en_US.xml:87(comment)
 msgid "The generic term \"Red Hat\""
 msgstr ""
 
-#: entities-en_US.xml:95(text) 
+#: entities-en_US.xml:88(text)
 msgid "Red Hat"
 msgstr ""
 
-#: entities-en_US.xml:98(comment) 
+#: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr ""
 
-#: entities-en_US.xml:99(text) 
+#: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
 msgstr ""
 
-#: entities-en_US.xml:102(comment) 
+#: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
 msgstr ""
 
-#: entities-en_US.xml:103(text) 
+#: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
 msgstr ""
 
-#: entities-en_US.xml:106(comment) 
+#: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
 msgstr ""
 
-#: entities-en_US.xml:107(text) 
+#: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
 msgstr ""
 
-#: entities-en_US.xml:110(comment) 
+#: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr ""
 
-#: entities-en_US.xml:111(text) 
+#: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr ""
 
-#: entities-en_US.xml:116(comment) 
+#: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
 msgstr ""
 
-#: entities-en_US.xml:117(text) 
+#: entities-en_US.xml:110(text)
 msgid "SELinux"
 msgstr ""
 
-#: entities-en_US.xml:123(text) 
+#: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:127(text) 
+#: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:131(text) 
+#: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:135(text) 
+#: entities-en_US.xml:128(text)
 msgid "opl.xml"
 msgstr ""
 
-#: entities-en_US.xml:139(text) 
+#: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:143(text) 
+#: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:147(text) 
+#: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:161(text) 
+#: entities-en_US.xml:154(text)
 msgid "Installation Guide"
 msgstr ""
 
-#: entities-en_US.xml:165(text) 
+#: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
 msgstr ""
 
-#: entities-en_US.xml:181(text) 
+#: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:185(text) 
+#: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:189(text) 
+#: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
 msgstr ""
 
-#: entities-en_US.xml:193(text) 
+#: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en_US.xml:0(None) 
+#: entities-en_US.xml:0(None)
 msgid "translator-credits"
 msgstr ""
-
diff --git a/common/entities/entities.pot b/common/entities/entities.pot
index bdb381f..23f57f5 100644
--- a/common/entities/entities.pot
+++ b/common/entities/entities.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-02 16:52-0600\n"
+"POT-Creation-Date: 2006-03-02 18:04-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"