From 493a504cd19418bb51f2011ebc1faf4a0104cfb3 Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Thu, 22 Mar 2007 12:16:48 +0000
Subject: Get project-wide entities building correctly using the new PO
 structures.

---
 Makefile.common | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index d158b32..fe9547b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -154,8 +154,10 @@ FDP_ENTITIES=fdp-entities.ent
 	${XML2PO} ${XML2POFLAGS} $< >$@
 
 %.ent:	%.xml
-	${XSLTPROC} -o $@ --stringparam FDPCOMMONDIR "NONE" \
-		${FDPCOMMONDIR}/common/entities/entities.xsl $<
+	${XSLTPROC} -o $@.tmp \
+		--stringparam FDPCOMMONDIR "${FDPCOMMONDIR}/common" \
+		${FDPCOMMONDIR}/common/entities/entities.xsl $< && \
+		move-if-change $@.tmp $@
 #########################################################################
 
 #########################################################################
@@ -1007,14 +1009,17 @@ fedora-doc-${DOCBASE}-khelp.desktop:: ${RPMINFO}
 		${FDPCOMMONDIR}/packaging/khelpcenter-plugin.xsl 	\
 		${RPMINFO} >$@.tmp && move-if-change $@.tmp $@
 
-
+#
+#########################################################################
+# Build project-wide entities.  
+# These must be built in their container dir so the DTD is parsed
+# correctly.
 define	FDP_ENTITIES_template
-${1}/$${FDP_ENTITIES}:: ${FDPCOMMONDIR}/common/entities/entities-${1}.xml
-	mkdir -p ${1}
-	xsltproc --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}/common" \
-		$${FDPCOMMONDIR}/common/entities/entities.xsl \
-		$${FDPCOMMONDIR}/common/entities/entities-${1}.xml \
-		>$$@.tmp && move-if-change $$@.tmp $$@
+${FDPCOMMONDIR}/common/entities/entities-${1}.ent::
+	pushd ${FDPCOMMONDIR}/common/entities && make entities-${1}.ent
+
+${1}/$${FDP_ENTITIES}:: ${FDPCOMMONDIR}/common/entities/entities-${1}.ent
+	cp -p ${FDPCOMMONDIR}/common/entities/entities-${1}.ent $$@
 
 clean::
 	${RM} ${1}/$${FDP_ENTITIES}
-- 
cgit