Build src/test/regress/README during tarball making like the other

petere · petere · commit 0bc2a8ca6556 · 2006-04-06T18:54:37.000Z
generated text files.  Fix build of that file, too.

Put the text files in the right place during make dist, so there are no
extra manual steps required anymore.
diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.43 2006/04/03 18:47:41 petere Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.44 2006/04/06 18:54:36 petere Exp $
 #
 
 subdir =
@@ -108,6 +108,10 @@ distdir:
 	  fi || exit; \
 	done
 	$(MAKE) -C $(distdir) distprep
+	$(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README
+	cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/
+	cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
+	cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
 	$(MAKE) -C $(distdir) distclean
 	rm -f $(distdir)/README.CVS
 
diff --git 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.75 2005/01/04 21:03:30 petere Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.76 2006/04/06 18:54:36 petere Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -196,7 +196,8 @@ HISTORY.html: release.sgml
 
 regress_README.html: regress.sgml
 	( echo '<!doctype chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" ['; \
-	  echo '<!entity % standalone-ignore "IGNORE"> ]>'; \
+	  echo '<!entity % standalone-ignore "IGNORE">'; \
+	  echo '<!entity % standalone-include "INCLUDE"> ]>'; \
 	  cat $< ) >tempfile_regress_README.sgml
 	$(JADE.text) -V nochunks tempfile_regress_README.sgml >$@
 	rm tempfile_regress_README.sgml
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.50 2006/01/22 05:20:32 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.51 2006/04/06 18:54:36 petere Exp $ -->
 
  <chapter id="regress">
   <title id="regress-title">Regression Tests</title>
@@ -313,7 +313,9 @@ exclusion of those that don't.
      If the <literal>errors</literal> test results in a server crash
      at the <literal>select infinite_recurse()</> command, it means that
      the platform's limit on process stack size is smaller than the
-     <xref linkend="guc-max-stack-depth"> parameter indicates.  This
+     <![%standalone-ignore;[<xref linkend="guc-max-stack-depth">]]>
+     <![%standalone-include;[<literal>max_stack_depth</literal>]]>
+     parameter indicates.  This
      can be fixed by running the postmaster under a higher stack
      size limit (4MB is recommended with the default value of 
      <varname>max_stack_depth</>).  If you are unable to do that, an
diff --git a/src/test/regress/README b/src/test/regress/README

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# PostgreSQL top level makefile`
`3`	`3`	`#`
`4`		`-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.43 2006/04/03 18:47:41 petere Exp $`
	`4`	`+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.44 2006/04/06 18:54:36 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir =`
`@@ -108,6 +108,10 @@ distdir:`
`108`	`108`	`fi \|\| exit; \`
`109`	`109`	`done`
`110`	`110`	`$(MAKE) -C $(distdir) distprep`
	`111`	`+ $(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README`
	`112`	`+ cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/`
	`113`	`+ cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/`
	`114`	`+ cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README`
`111`	`115`	`$(MAKE) -C $(distdir) distclean`
`112`	`116`	`rm -f $(distdir)/README.CVS`
`113`	`117`
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.75 2005/01/04 21:03:30 petere Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.76 2006/04/06 18:54:36 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -196,7 +196,8 @@ HISTORY.html: release.sgml`
`196`	`196`
`197`	`197`	`regress_README.html: regress.sgml`
`198`	`198`	`( echo '<!doctype chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" ['; \`
`199`		`- echo '<!entity % standalone-ignore "IGNORE"> ]>'; \`
	`199`	`+ echo '<!entity % standalone-ignore "IGNORE">'; \`
	`200`	`+ echo '<!entity % standalone-include "INCLUDE"> ]>'; \`
`200`	`201`	`cat $< ) >tempfile_regress_README.sgml`
`201`	`202`	`$(JADE.text) -V nochunks tempfile_regress_README.sgml >$@`
`202`	`203`	`rm tempfile_regress_README.sgml`