summaryrefslogtreecommitdiffstats
path: root/Makefile.common
diff options
context:
space:
mode:
authorPaul W. Frields <stickster@gmail.com>2007-03-22 12:16:48 +0000
committerPaul W. Frields <stickster@gmail.com>2007-03-22 12:16:48 +0000
commit493a504cd19418bb51f2011ebc1faf4a0104cfb3 (patch)
tree8345c9263599e494c86fe1ee29d4456efdb20c69 /Makefile.common
parent7630f8ef8b207dcb06efc909fc7f60696b3f04fe (diff)
downloadfedora-doc-utils-493a504cd19418bb51f2011ebc1faf4a0104cfb3.tar.gz
fedora-doc-utils-493a504cd19418bb51f2011ebc1faf4a0104cfb3.tar.xz
fedora-doc-utils-493a504cd19418bb51f2011ebc1faf4a0104cfb3.zip
Get project-wide entities building correctly using the new PO structures.
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common23
1 files changed, 14 insertions, 9 deletions
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}