Author: jtr
Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6273
Modified Files: Makefile.common Log Message: Added a "make OLD=old.xml NEW=new.xml diff" target to utilize the xmldiff tool a bit easier.
Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile.common 12 Dec 2005 16:32:16 -0000 1.21 +++ Makefile.common 15 Dec 2005 06:00:02 -0000 1.22 @@ -34,6 +34,9 @@ ifeq (${FDPDIR},) FDPDIR = .. endif +ifeq (${FDPBIN},) +FDPBIN = ${FDPDIR}/docs-common/bin +endif ifeq (${XSLPDF},) XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl endif @@ -84,9 +87,8 @@ cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css [ -z "${HTMLCSSEXTRA}" ] || \ cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png - [ ! -d figs ] || \ - ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ - -l ${LANG} figs $(DOCBASE)-$(1) + [ ! -d figs ] || ${FDPBIN}/copy-figs -v -f '*.png' \ + -l ${LANG} figs $(DOCBASE)-$(1) endef # html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html) @@ -153,5 +155,18 @@ @echo "LANGUAGES="$(LANGUAGES)"" # ######################################################################### +# Show differences between two file revisions. To use this tool: +# $ make OLD=old.xml NEW=new.xml diff +# The ${DIFFS} macro can select a different output format: +# $ make DIFFS=-C OLD=old.xml NEW=new.xml diff + +OLD =define-me-old.xml +NEW =define-me-new.xml +DIFFS =-u + +diff:: + ${FDPBIN}/xmldiff ${DIFFS} ${OLD} ${NEW} +# +######################################################################### # End of Makefile.common #########################################################################