Modify draft SGML instructions to use DRAFT=Y because recursion was

causing html to be called twice --- no way to exit the makefile after
the recursion returns.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 3ed2654356ce7b19e620125b7f0c52eeb76f4bd9..ea0e197dceb54450deaea72348921d6f01275f91 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.91 2007/01/11 00:02:39 momjian Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.92 2007/01/26 22:23:49 momjian Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -64,7 +64,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty
 ## Man pages
 ##
 
-.PHONY: man draft
+.PHONY: html man draft clean
 
 DEFAULTSECTION := $(sqlmansect_dummy)
 
@@ -86,8 +86,6 @@ man: postgres.sgml $(ALLSGML)
 
 all: html
 
-.PHONY: html
-
 # This is run for all output formats because we need bookindex.sgml
 html: postgres.sgml $(ALLSGML) stylesheet.dsl
        @rm -f *.html
@@ -95,7 +93,7 @@ html: postgres.sgml $(ALLSGML) stylesheet.dsl
 ifeq ($(vpath_build), yes)
        @cp $(srcdir)/stylesheet.css .
 endif
-ifndef DRAFT
+ifneq ($(DRAFT), Y)
 # If not draft, re-run the this rule until HTML.index does not change
        @cmp -s HTML.index.start HTML.index || $(MAKE) $@
 endif
@@ -103,18 +101,6 @@ endif
 
 COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
 
-# The draft rule calls gmake again and sets the DRAFT variable.
-# This seems to be the only way to set gmake variables in a rule.
-draft:
-ifndef DRAFT
-ifneq ($(MAKECMDGOALS), draft)
-       @$(MAKE) DRAFT="Y" $(MAKECMDGOALS)
-else
-# simulate $(MAKE) with no arguments
-       @$(MAKE) DRAFT="Y" all
-endif
-endif
-
 # bookindex.sgml is required so there is a proper index for all output formats
 bookindex.sgml: HTML.index
 # create a dummy bookindex.html

diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 3dcec8d14013c1649bcfc675352e4ce68d8431af..3a763b07ceb1d9711084a3e00c7c467e49be9d78 100644 (file)
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.65 2007/01/11 00:02:39 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.66 2007/01/26 22:23:50 momjian Exp $ -->
 
 <appendix id="docguide">
  <title>Documentation</title>
@@ -546,7 +546,7 @@ checking for sgmlspl... sgmlspl
     stages.  If you do not care about the index, and just want to
     proof-read the output, use <literal>draft</>:
 <screen>
-<prompt>doc/src/sgml$ </prompt><userinput>gmake draft html</userinput>
+<prompt>doc/src/sgml$ </prompt><userinput>gmake DRAFT=Y html</userinput>
 </screen>
    </para>