diff options
| author | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2006-01-31 17:58:20 +0000 |
|---|---|---|
| committer | Tommy Reynolds <Tommy.Reynolds@MegaCoder.com> | 2006-01-31 17:58:20 +0000 |
| commit | ee0ff0638cc186c7df7fbe9701749e6a82b55942 (patch) | |
| tree | 26256fe2f96d991b4ef8edc288d3fd637a41a873 | |
| parent | 10fe34c7cf70f1dee179ae7dad989abc3506e4c5 (diff) | |
| download | fedora-doc-utils-ee0ff0638cc186c7df7fbe9701749e6a82b55942.tar.gz fedora-doc-utils-ee0ff0638cc186c7df7fbe9701749e6a82b55942.tar.xz fedora-doc-utils-ee0ff0638cc186c7df7fbe9701749e6a82b55942.zip | |
Doh! Now the "make DRAFT=no html" or "make DRAFT=yes html" actually
work. Defaults to "make DRAFT=yes".
| -rw-r--r-- | Makefile.common | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common index 7bba155..d4d4eea 100644 --- a/Makefile.common +++ b/Makefile.common @@ -33,28 +33,28 @@ sinclude Make.paths ######################################################################### # Supply default values for the boilerplate files _unless_ the user has # provided their own values. -ifeq (${FDPDIR},) +ifeq "${FDPDIR}" "" FDPDIR = $(PWD)/.. endif -ifeq (${FDPBIN},) +ifeq "${FDPBIN}" "" FDPBIN = ${FDPDIR}/docs-common/bin endif -ifeq (${XSLPDF},) +ifeq "${XSLPDF}" "" XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl endif -ifeq (${XSLHTML},) +ifeq "${XSLHTML}" "" XSLHTML = ${FDPDIR}/docs-common/xsl/main-html.xsl endif -ifeq (${XSLHTMLNOCHUNKS},) +ifeq "${XSLHTMLNOCHUNKS}" "" XSLHTMLNOCHUNKS = ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl endif -ifeq (${HTMLCSS},) +ifeq "${HTMLCSS}" "" HTMLCSS = ${FDPDIR}/docs-common/css/fedora-draft.css endif -ifeq (${DRAFT},) +ifeq "${DRAFT}" "" DRAFT = yes endif -ifeq (${RPMINFO},) +ifeq "${RPMINFO}" "" RPMINFO = ${PWD}/rpm-info.xml endif ######################################################################### @@ -122,8 +122,8 @@ html-$(1) ${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 -ifeq (${DRAFT},"yes") - cp ${FDPDIR}/docs-common/images/watermark-$(1).png +ifeq "${DRAFT}" "yes" + cp ${FDPDIR}/docs-common/images/watermark-$(1).png $(DOCBASE)-$(1)/watermark.png endif [ ! -d figs ] || copy-figs -v -f '*.png' \ -l $(1) figs $(DOCBASE)-$(1) |