Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3795
Modified Files:
Makefile.common
Log Message:
Get project-wide entities building correctly using the new PO structures.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- Makefile.common 22 Mar 2007 03:27:55 -0000 1.146
+++ Makefile.common 22 Mar 2007 12:16:48 -0000 1.147
@@ -154,8 +154,10 @@
${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 @@
${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}
Show replies by date