diff options
| author | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-10 02:53:07 +0000 |
|---|---|---|
| committer | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2005-12-10 02:53:07 +0000 |
| commit | 8bc3739e190fc803f113cf14741c17caf4994533 (patch) | |
| tree | 944aeaf64e92d13dc9c2bd6a669bf1a15e59229d | |
| parent | 53d9cae361b518986f995fdacc9b67e3a90dad8b (diff) | |
| download | fedora-doc-utils-8bc3739e190fc803f113cf14741c17caf4994533.tar.gz fedora-doc-utils-8bc3739e190fc803f113cf14741c17caf4994533.tar.xz fedora-doc-utils-8bc3739e190fc803f113cf14741c17caf4994533.zip | |
Allow ${HTMLCSSEXTRA} to be blank and not create the "watermark.png" file.
Copy "watermark-${LANG}.png" to "watermark.png" by default.
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 48d141a..4fe83f0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -71,7 +71,7 @@ ${TARGETS}:: # mkdir -p mydoc-en/stylesheet-images # cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/ # cp ${HTMLCSS} mydoc-en/fedora.css -# cp ${HTMLCSSEXTRA} mydoc-en/ +# 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 @@ -85,7 +85,8 @@ ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css - cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/ + [ -z "${HTMLCSSEXTRA}" ] || \ + cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png [ ! -d figs ] || ( \ mkdir -p ${DOCBASE}-$(1)/figs; \ find figs -type f -iname '*.*' -print | \ @@ -107,7 +108,8 @@ ${DOCBASE}-$(1).html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) mkdir -p stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/ cp ${HTMLCSS} fedora.css - cp ${HTMLCSSEXTRA} . + [ -z "${HTMLCSSEXTRA}" ] || \ + cp ${HTMLCSSEXTRA} watermark.png endef # html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html) @@ -146,7 +148,7 @@ ${DOCBASE}-$(1)-clean:: ${RM} -r ${DOCBASE}-$(1).html stylesheet-images ${RM} -r ${DOCBASE}-$(1).pdf ${RM} -r ${DOCBASE}-$(1).tar.gz - ${RM} fedora.css watermark.png + ${RM} fedora.css watermark-${LANG}.png endef # distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean) |