diff options
| author | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-15 06:00:02 +0000 |
|---|---|---|
| committer | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-15 06:00:02 +0000 |
| commit | a7de9f2b8912568bc4e737976abbe1b67077e737 (patch) | |
| tree | 73aca0ee2a117e92cb35d51c8d601fb935bc6a82 | |
| parent | 10cf9f9f39c2ec0d5d79eccbd0ddea510ef9a121 (diff) | |
| download | fedora-doc-utils-a7de9f2b8912568bc4e737976abbe1b67077e737.tar.gz fedora-doc-utils-a7de9f2b8912568bc4e737976abbe1b67077e737.tar.xz fedora-doc-utils-a7de9f2b8912568bc4e737976abbe1b67077e737.zip | |
Added a "make OLD=old.xml NEW=new.xml diff" target to utilize the
xmldiff tool a bit easier.
| -rw-r--r-- | Makefile.common | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index e2b746e..f7d1cce 100644 --- a/Makefile.common +++ b/Makefile.common @@ -34,6 +34,9 @@ sinclude Make.paths 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 @@ ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) 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 @@ showvars:: @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 ######################################################################### |