mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Remove SGML makefile .SECONDARY tag so html rules will work properly;
Documentation/comment improvements.
This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
# PostgreSQL documentation makefile
 | 
					# PostgreSQL documentation makefile
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.90 2007/01/10 19:06:04 momjian Exp $
 | 
					# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.91 2007/01/11 00:02:39 momjian Exp $
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#----------------------------------------------------------------------------
 | 
					#----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -10,7 +10,6 @@ subdir = doc/src/sgml
 | 
				
			|||||||
top_builddir = ../../..
 | 
					top_builddir = ../../..
 | 
				
			||||||
include $(top_builddir)/src/Makefile.global
 | 
					include $(top_builddir)/src/Makefile.global
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.SECONDARY:
 | 
					 | 
				
			||||||
.NOTPARALLEL:
 | 
					.NOTPARALLEL:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifndef COLLATEINDEX
 | 
					ifndef COLLATEINDEX
 | 
				
			||||||
@@ -97,13 +96,14 @@ ifeq ($(vpath_build), yes)
 | 
				
			|||||||
	@cp $(srcdir)/stylesheet.css .
 | 
						@cp $(srcdir)/stylesheet.css .
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifndef DRAFT
 | 
					ifndef DRAFT
 | 
				
			||||||
 | 
					# If not draft, re-run the this rule until HTML.index does not change
 | 
				
			||||||
	@cmp -s HTML.index.start HTML.index || $(MAKE) $@
 | 
						@cmp -s HTML.index.start HTML.index || $(MAKE) $@
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
 | 
					COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# The draft rule calls $(MAKE) again and sets the DRAFT variable.
 | 
					# 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.
 | 
					# This seems to be the only way to set gmake variables in a rule.
 | 
				
			||||||
draft:
 | 
					draft:
 | 
				
			||||||
ifndef DRAFT
 | 
					ifndef DRAFT
 | 
				
			||||||
@@ -148,9 +148,8 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# RTF to allow minor editing for hardcopy
 | 
					# RTF to allow minor editing for hardcopy
 | 
				
			||||||
 | 
					%.rtf: %.sgml $(ALLSGML) html
 | 
				
			||||||
%.rtf: %.sgml $(ALLSGML) stylesheet.dsl
 | 
						$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print postgres.sgml
 | 
				
			||||||
	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print $<
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# TeX
 | 
					# TeX
 | 
				
			||||||
# Regular TeX and pdfTeX have slightly differing requirements, so we
 | 
					# Regular TeX and pdfTeX have slightly differing requirements, so we
 | 
				
			||||||
@@ -192,7 +191,7 @@ JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d $(srcdir)/styl
 | 
				
			|||||||
# This generates an XML version of the flow-object tree.  It's useful
 | 
					# This generates an XML version of the flow-object tree.  It's useful
 | 
				
			||||||
# for debugging DSSSL code, and possibly to interface to some other
 | 
					# for debugging DSSSL code, and possibly to interface to some other
 | 
				
			||||||
# tools that can make use of this.
 | 
					# tools that can make use of this.
 | 
				
			||||||
%.fot: %.sgml $(ALLSGML) stylesheet.dsl
 | 
					%.fot: %.sgml $(ALLSGML) html
 | 
				
			||||||
	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t fot -i output-print -o $@ $<
 | 
						$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t fot -i output-print -o $@ $<
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.64 2007/01/09 22:19:36 momjian Exp $ -->
 | 
					<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.65 2007/01/11 00:02:39 momjian Exp $ -->
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<appendix id="docguide">
 | 
					<appendix id="docguide">
 | 
				
			||||||
 <title>Documentation</title>
 | 
					 <title>Documentation</title>
 | 
				
			||||||
@@ -543,7 +543,7 @@ checking for sgmlspl... sgmlspl
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   <para>
 | 
					   <para>
 | 
				
			||||||
    To create a proper index, the build might process several identical
 | 
					    To create a proper index, the build might process several identical
 | 
				
			||||||
    stages.  If you do not care about an index, and just want to
 | 
					    stages.  If you do not care about the index, and just want to
 | 
				
			||||||
    proof-read the output, use <literal>draft</>:
 | 
					    proof-read the output, use <literal>draft</>:
 | 
				
			||||||
<screen>
 | 
					<screen>
 | 
				
			||||||
<prompt>doc/src/sgml$ </prompt><userinput>gmake draft html</userinput>
 | 
					<prompt>doc/src/sgml$ </prompt><userinput>gmake draft html</userinput>
 | 
				
			||||||
@@ -552,7 +552,7 @@ checking for sgmlspl... sgmlspl
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   <para>
 | 
					   <para>
 | 
				
			||||||
    To allow for easier handling in the final distribution, the files
 | 
					    To allow for easier handling in the final distribution, the files
 | 
				
			||||||
    comprising the HTML documentation are stored in a tar archive that
 | 
					    comprising the HTML documentation can be stored in a tar archive that
 | 
				
			||||||
    is unpacked at installation time.  To create the
 | 
					    is unpacked at installation time.  To create the
 | 
				
			||||||
    <acronym>HTML</acronym> documentation package, use the commands
 | 
					    <acronym>HTML</acronym> documentation package, use the commands
 | 
				
			||||||
<programlisting>
 | 
					<programlisting>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user