aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/Makefile13
-rw-r--r--doc/src/sgml/docguide.sgml6
2 files changed, 9 insertions, 10 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 825dcc8e5d8..3ed2654356c 100644
--- 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.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 = ../../..
include $(top_builddir)/src/Makefile.global
-.SECONDARY:
.NOTPARALLEL:
ifndef COLLATEINDEX
@@ -97,13 +96,14 @@ ifeq ($(vpath_build), yes)
@cp $(srcdir)/stylesheet.css .
endif
ifndef DRAFT
+# If not draft, re-run the this rule until HTML.index does not change
@cmp -s HTML.index.start HTML.index || $(MAKE) $@
endif
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.
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: %.sgml $(ALLSGML) stylesheet.dsl
- $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print $<
+%.rtf: %.sgml $(ALLSGML) html
+ $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print postgres.sgml
# TeX
# 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
# for debugging DSSSL code, and possibly to interface to some other
# 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 $@ $<
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 439f1bf9cdf..3dcec8d1401 100644
--- 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.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">
<title>Documentation</title>
@@ -543,7 +543,7 @@ checking for sgmlspl... sgmlspl
<para>
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</>:
<screen>
<prompt>doc/src/sgml$ </prompt><userinput>gmake draft html</userinput>
@@ -552,7 +552,7 @@ checking for sgmlspl... sgmlspl
<para>
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
<acronym>HTML</acronym> documentation package, use the commands
<programlisting>