diff options
author | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-11 03:26:10 +0000 |
---|---|---|
committer | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-11 03:26:10 +0000 |
commit | c4c0161f570cc0f8ded83b24755f156a6bfccc80 (patch) | |
tree | d50981f43450714a772cd6e0e13d91b3e9c6f577 /Makefile.common | |
parent | cb6039e7a61128a2477ad18324015f5ba7e0ff7f (diff) | |
download | fedora-doc-utils-c4c0161f570cc0f8ded83b24755f156a6bfccc80.tar.gz fedora-doc-utils-c4c0161f570cc0f8ded83b24755f156a6bfccc80.tar.xz fedora-doc-utils-c4c0161f570cc0f8ded83b24755f156a6bfccc80.zip |
Allow a document 'figs/' directory to contain its own subdirectory
structure. Copy the directory tree, but only populate it with files
which pass the '-f glob' filter(s). If no filters are given, "*" is
used as a default.
Diffstat (limited to 'Makefile.common')
-rw-r--r-- | Makefile.common | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Makefile.common b/Makefile.common index 4fe83f0..cfba08e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -73,11 +73,8 @@ ${TARGETS}:: # cp ${HTMLCSS} mydoc-en/fedora.css # cp ${HTMLCSSEXTRA} mydoc-en/watermark.png # cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/ -# mkdir -p mydoc-en/figs -# cp -p figs/*-${LANG}.* mydoc-en/figs +# ${FDPDIR}/docs-common/bin/copy-figs -f '*.png' figs mydoc-en/ # but we do avoid copying EPS files since they are nonsense to the HTML world. -# Also, we create the figs directory only if the document dir has a "figs/". -# I don't think we need to do this for a nochunks output, though. # define HTML_template ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) @@ -87,13 +84,9 @@ ${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 ] || ( \ - mkdir -p ${DOCBASE}-$(1)/figs; \ - find figs -type f -iname '*.*' -print | \ - egrep -vi '*.eps' | \ - egrep '(.*-$(1)..*)|([^-]*[.][^-]*)' | \ - while read x; do cp -f $$$${x} ${DOCBASE}-$(1)/figs; done \ - ) && exit 0 + [ ! -d figs ] || \ + ${FDPDIR}/docs-common/bin/copy-figs -v -f '*.png' \ + figs $(DOCBASE)-$(1) endef # html:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG)/index.html) |