Author: jtr

Update of /cvs/docs/docs-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14321

Modified Files: Makefile.common Log Message: Doh! Now the "make DRAFT=no html" or "make DRAFT=yes html" actually work. Defaults to "make DRAFT=yes".

Index: Makefile.common =================================================================== RCS file: /cvs/docs/docs-common/Makefile.common,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Makefile.common 30 Jan 2006 10:32:17 -0000 1.36 +++ Makefile.common 31 Jan 2006 17:58:20 -0000 1.37 @@ -33,28 +33,28 @@ ######################################################################### # 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 @@ 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)