NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit320abc3

committed

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

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

1 parent4355d21 commit320abc3Copy full SHA for 320abc3

File tree

2 files changed

-19

lines changed

doc/src/sgml
- Makefile
- docguide.sgml

2 files changed

-19

lines changed

`‎doc/src/sgml/Makefile‎`

Lines changed: 3 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# PostgreSQL documentation makefile`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.91 2007/01/11 00:02:39 momjian Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.92 2007/01/26 22:23:49 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -64,7 +64,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty`
`64`	`64`	`## Man pages`
`65`	`65`	`##`
`66`	`66`
`67`		`-.PHONY: man draft`
	`67`	`+.PHONY:htmlman draft clean`
`68`	`68`
`69`	`69`	`DEFAULTSECTION :=$(sqlmansect_dummy)`
`70`	`70`
`@@ -86,35 +86,21 @@ man: postgres.sgml $(ALLSGML)`
`86`	`86`
`87`	`87`	`all: html`
`88`	`88`
`89`		`-.PHONY: html`
`90`		`-`
`91`	`89`	`# This is run for all output formats because we need bookindex.sgml`
`92`	`90`	`html: postgres.sgml$(ALLSGML) stylesheet.dsl`
`93`	`91`	`@rm -f*.html`
`94`	`92`	`$(JADE)$(JADEFLAGS)$(SPFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -i output-html -t sgml$<`
`95`	`93`	`ifeq ($(vpath_build), yes)`
`96`	`94`	`@cp $(srcdir)/stylesheet.css .`
`97`	`95`	`endif`
`98`		`-ifndefDRAFT`
	`96`	`+ifneq ($(DRAFT), Y)`
`99`	`97`	`# If not draft, re-run the this rule until HTML.index does not change`
`100`	`98`	`@cmp -s HTML.index.start HTML.index \|\| $(MAKE) $@`
`101`	`99`	`endif`
`102`	`100`
`103`	`101`
`104`	`102`	`COLLATEINDEX := LC_ALL=C$(PERL)$(COLLATEINDEX) -f -g`
`105`	`103`
`106`		`-# The draft rule calls gmake again and sets the DRAFT variable.`
`107`		`-# This seems to be the only way to set gmake variables in a rule.`
`108`		`-draft:`
`109`		`-ifndefDRAFT`
`110`		`-ifneq ($(MAKECMDGOALS), draft)`
`111`		`-@$(MAKE) DRAFT="Y" $(MAKECMDGOALS)`
`112`		`-else`
`113`		`-# simulate $(MAKE) with no arguments`
`114`		`-@$(MAKE) DRAFT="Y" all`
`115`		`-endif`
`116`		`-endif`
`117`		`-`
`118`	`104`	`# bookindex.sgml is required so there is a proper index for all output formats`
`119`	`105`	`bookindex.sgml: HTML.index`
`120`	`106`	`# create a dummy bookindex.html`

`‎doc/src/sgml/docguide.sgml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.65 2007/01/11 00:02:39 momjian Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.66 2007/01/26 22:23:50 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<appendix id="docguide">`
`4`	`4`	`<title>Documentation</title>`
`@@ -546,7 +546,7 @@ checking for sgmlspl... sgmlspl`
`546`	`546`	`stages. If you do not care about the index, and just want to`
`547`	`547`	`proof-read the output, use <literal>draft</>:`
`548`	`548`	`<screen>`
`549`		`-<prompt>doc/src/sgml$ </prompt><userinput>gmakedraft html</userinput>`
	`549`	`+<prompt>doc/src/sgml$ </prompt><userinput>gmakeDRAFT=Y html</userinput>`
`550`	`550`	`</screen>`
`551`	`551`	`</para>`
`552`	`552`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit320abc3

File tree

2 files changed

2 files changed

`‎doc/src/sgml/Makefile‎`

`‎doc/src/sgml/docguide.sgml‎`

0 commit comments