NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitebdee66

committed

Remove SGML makefile .SECONDARY tag so html rules will work properly;

Documentation/comment improvements.

1 parentc0e977c commitebdee66Copy full SHA for ebdee66

File tree

2 files changed

-10

lines changed

doc/src/sgml
- Makefile
- docguide.sgml

2 files changed

-10

lines changed

`‎doc/src/sgml/Makefile‎`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,14 @@`
`2`	`2`	`#`
`3`	`3`	`# PostgreSQL documentation makefile`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.90 2007/01/10 19:06:04 momjian Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.91 2007/01/11 00:02:39 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`9`	`9`	`subdir = doc/src/sgml`
`10`	`10`	`top_builddir = ../../..`
`11`	`11`	`include$(top_builddir)/src/Makefile.global`
`12`	`12`
`13`		`-.SECONDARY:`
`14`	`13`	`.NOTPARALLEL:`
`15`	`14`
`16`	`15`	`ifndefCOLLATEINDEX`
`@@ -97,13 +96,14 @@ ifeq ($(vpath_build), yes)`
`97`	`96`	`@cp $(srcdir)/stylesheet.css .`
`98`	`97`	`endif`
`99`	`98`	`ifndefDRAFT`
	`99`	`+# If not draft, re-run the this rule until HTML.index does not change`
`100`	`100`	`@cmp -s HTML.index.start HTML.index \|\| $(MAKE) $@`
`101`	`101`	`endif`
`102`	`102`
`103`	`103`
`104`	`104`	`COLLATEINDEX := LC_ALL=C$(PERL)$(COLLATEINDEX) -f -g`
`105`	`105`
`106`		`-# The draft rule calls$(MAKE) again and sets the DRAFT variable.`
	`106`	`+# The draft rule callsgmake again and sets the DRAFT variable.`
`107`	`107`	`# This seems to be the only way to set gmake variables in a rule.`
`108`	`108`	`draft:`
`109`	`109`	`ifndefDRAFT`
`@@ -148,9 +148,8 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package`
`148`	`148`
`149`	`149`
`150`	`150`	`# RTF to allow minor editing for hardcopy`
`151`		`-`
`152`		`-%.rtf:%.sgml$(ALLSGML) stylesheet.dsl`
`153`		`-$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print$<`
	`151`	`+%.rtf:%.sgml$(ALLSGML) html`
	`152`	`+$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print postgres.sgml`
`154`	`153`
`155`	`154`	`# TeX`
`156`	`155`	`# Regular TeX and pdfTeX have slightly differing requirements, so we`
`@@ -192,7 +191,7 @@ JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d $(srcdir)/styl`
`192`	`191`	`# This generates an XML version of the flow-object tree. It's useful`
`193`	`192`	`# for debugging DSSSL code, and possibly to interface to some other`
`194`	`193`	`# tools that can make use of this.`
`195`		`-%.fot:%.sgml$(ALLSGML)stylesheet.dsl`
	`194`	`+%.fot:%.sgml$(ALLSGML)html`
`196`	`195`	`$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t fot -i output-print -o$@$<`
`197`	`196`
`198`	`197`

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

Lines changed: 3 additions & 3 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.64 2007/01/09 22:19:36 momjian Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.65 2007/01/11 00:02:39 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<appendix id="docguide">`
`4`	`4`	`<title>Documentation</title>`
`@@ -543,7 +543,7 @@ checking for sgmlspl... sgmlspl`
`543`	`543`
`544`	`544`	`<para>`
`545`	`545`	`To create a proper index, the build might process several identical`
`546`		`- stages. If you do not care aboutan index, and just want to`
	`546`	`+ stages. If you do not care aboutthe index, and just want to`
`547`	`547`	`proof-read the output, use <literal>draft</>:`
`548`	`548`	`<screen>`
`549`	`549`	`<prompt>doc/src/sgml$ </prompt><userinput>gmake draft html</userinput>`
`@@ -552,7 +552,7 @@ checking for sgmlspl... sgmlspl`
`552`	`552`
`553`	`553`	`<para>`
`554`	`554`	`To allow for easier handling in the final distribution, the files`
`555`		`- comprising the HTML documentationare stored in a tar archive that`
	`555`	`+ comprising the HTML documentationcan be stored in a tar archive that`
`556`	`556`	`is unpacked at installation time. To create the`
`557`	`557`	`<acronym>HTML</acronym> documentation package, use the commands`
`558`	`558`	`<programlisting>`

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!

Commitebdee66

File tree

2 files changed

2 files changed

`‎doc/src/sgml/Makefile‎`

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

0 commit comments