diff options
author | Paul W. Frields <stickster@gmail.com> | 2007-09-07 17:48:22 +0000 |
---|---|---|
committer | Paul W. Frields <stickster@gmail.com> | 2007-09-07 17:48:22 +0000 |
commit | 3dbfae1922680b542e742c6ebc901fa6b3847fd5 (patch) | |
tree | 7592bed189629c1c954ac0553b0fd995a72124dd | |
parent | 1f5ba7744b34d5075b94a911dff8129c5ee94bca (diff) | |
download | fedora-doc-utils-3dbfae1922680b542e742c6ebc901fa6b3847fd5.tar.gz fedora-doc-utils-3dbfae1922680b542e742c6ebc901fa6b3847fd5.tar.xz fedora-doc-utils-3dbfae1922680b542e742c6ebc901fa6b3847fd5.zip |
Cleanups for legibility and style rules (see top of this file) :-)
-rw-r--r-- | Makefile.common | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common index 430e7fc..3cfe2dd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -597,16 +597,18 @@ define HTML_template .PHONY: html-${1} html-$(1):: ${DOCBASE}-$(1)/index.html ${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} - LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml + LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) \ + $(1)/$(DOCBASE).xml mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ - cp ${FDPCOMMONDIR}/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images + cp ${FDPCOMMONDIR}/stylesheet-images/*.png \ + $(DOCBASE)-$(1)/stylesheet-images cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css ifneq "${DRAFT}" "no" - cp ${FDPCOMMONDIR}/images/watermark-$(1).png \ + cp ${FDPCOMMONDIR}/images/watermark-$(1).png \ $(DOCBASE)-$(1)/watermark.png endif - [ ! -d figs ] || copy-figs -v -f '*.png' \ - -l $(1) figs $(DOCBASE)-$(1) + [ ! -d figs ] || copy-figs -v -f '*.png' \ + -l $(1) figs $(DOCBASE)-$(1) distclean:: ${RM} -r ${DOCBASE}-${1} @@ -632,7 +634,8 @@ define HTMLNOCHUNK_template html-nochunks-$(1):: ${DOCBASE}-$(1).html ${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} - LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml + LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) \ + $(1)/$(DOCBASE).xml mv $(DOCBASE).html $(DOCBASE)-$(1).html mkdir -p stylesheet-images/ cp ${FDPCOMMONDIR}/stylesheet-images/*.png stylesheet-images/ @@ -744,7 +747,8 @@ ${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} ${XSLTPROC} $(FDPCOMMONDIR)/packaging/strip-for-txt.xsl \ $(1)/$(DOCBASE).lint.xml > $(1)/$(DOCBASE).stripped.xml rm $(1)/$(DOCBASE).lint.xml - LANG=$(1).UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt $(1)/$(DOCBASE).stripped.xml + LANG=$(1).UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt \ + $(1)/$(DOCBASE).stripped.xml mv $(DOCBASE).stripped.txt $(DOCBASE)-$(1).txt rm $(1)/$(DOCBASE).stripped.xml @@ -864,7 +868,8 @@ define khelp_template .PHONY: khelp-$(1) khelp-$(1):: ${XMLFILES-$(1)} ${XMLDEPFILES-$(1)} - LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null >$(1)/$(DOCBASE).xml-parsed + LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml \ + 2>/dev/null >$(1)/$(DOCBASE).xml-parsed mkdir -p kde-$(1) ${MEINPROC} --output kde-$(1)/index.docbook \ --cache kde-$(1)/index.cache.bz2 \ |