Received: from localhost (maia-2.hub.org [200.46.204.187])
	by postgresql.org (Postfix) with ESMTP id 571889FB35C;
	Sat, 27 Jan 2007 18:47:06 -0400 (AST)
Received: from postgresql.org ([200.46.204.71])
	by localhost (mx1.hub.org [200.46.204.187]) (amavisd-new, port 10024)
	with ESMTP id 58348-01; Sat, 27 Jan 2007 18:46:58 -0400 (AST)
X-Greylist: from auto-whitelisted by SQLgrey-1.7.4
X-Greylist: from auto-whitelisted by SQLgrey-1.7.4
Received: from momjian.us (momjian.us [70.90.9.53])
	by postgresql.org (Postfix) with ESMTP id 2F8FB9FB2AE;
	Sat, 27 Jan 2007 18:47:02 -0400 (AST)
Received: (from bruce@localhost) by momjian.us (8.11.6/8.11.6) id
 l0RMl1t13872;
	Sat, 27 Jan 2007 17:47:01 -0500 (EST)
From: Bruce Momjian <bruce@momjian.us>
Message-Id: <200701272247.l0RMl1t13872@momjian.us>
Subject: Re: Change draft gmake control
In-Reply-To: <23143.1169932756@sss.pgh.pa.us>
To: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 27 Jan 2007 17:47:01 -0500 (EST)
CC: Peter Eisentraut <peter_e@gmx.net>, pgsql-docs@postgresql.org,
	PostgreSQL-patches <pgsql-patches@postgresql.org>
X-Mailer: ELM [version 2.4ME+ PL123]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="ELM1169938021-23280-0_"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: Maia Mailguard 1.0.1
X-Archive-Number: 200701/26
X-Sequence-Number: 4122


--ELM1169938021-23280-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="US-ASCII"

Tom Lane wrote:
> Bruce Momjian <bruce@momjian.us> writes:
> > Well, if 'draft' was only for html, I could see suggesting just 'gmake
> > draft', but 'draft' can be used for Postscript and PDF too.
> 
> But those aren't cases where saving some typing is useful (in fact,
> I'd bet money that no one will ever use them).  Draft runs with html
> output are highly useful, and like Peter I think "make draft" ought
> to work for that.

OK, if that's what people want.  Patch attached and applied, docs
updated.

-- 
  Bruce Momjian   bruce@momjian.us
  EnterpriseDB    http://www.enterprisedb.com

  + If your life is a hard drive, Christ can be your backup. +

--ELM1169938021-23280-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-diff
Content-Disposition: inline; filename="/rtmp/diff"

Index: sgml/Makefile
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/Makefile,v
retrieving revision 1.93
diff -c -r1.93 Makefile
*** sgml/Makefile	26 Jan 2007 23:51:39 -0000	1.93
--- sgml/Makefile	27 Jan 2007 22:33:17 -0000
***************
*** 99,104 ****
--- 99,110 ----
  endif
  
  
+ # 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:
+ 	@$(MAKE) DRAFT="Y" html
+ 
+ 
  COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
  
  # bookindex.sgml is required so there is a proper index for all output formats
Index: sgml/docguide.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v
retrieving revision 1.66
diff -c -r1.66 docguide.sgml
*** sgml/docguide.sgml	26 Jan 2007 22:23:50 -0000	1.66
--- sgml/docguide.sgml	27 Jan 2007 22:33:17 -0000
***************
*** 546,552 ****
      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=Y html</userinput>
  </screen>
     </para>
  
--- 546,552 ----
      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</userinput>
  </screen>
     </para>
  

--ELM1169938021-23280-0_--