Commit2a81896

committed

Fix rules to re-generate config.h. The examples in the Autoconf manual are

flawed because the timestamp file is already updated when Makefile.globalis remade, and the rule for config.h never gets run.

1 parentad4fd77 commit2a81896Copy full SHA for 2a81896

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7761,6 +7761,9 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then`
`7761`	`7761`	`echo"$ac_t""done"1>&6`
`7762`	`7762`	`fi`
`7763`	`7763`
	`7764`	`+# (see Makefile.global)`
	`7765`	`+echo>src/include/stamp-h`
	`7766`	`+`
`7764`	`7767`	`trap'' 1 2 15`
`7765`	`7768`	`cat> confcache<<\EOF`
`7766`	`7769`	`# This file is a shell script that caches the results of configure`
`@@ -8242,7 +8245,6 @@ cat >> $CONFIG_STATUS <<EOF`
`8242`	`8245`
`8243`	`8246`	`EOF`
`8244`	`8247`	`cat>>$CONFIG_STATUS<<\EOF`
`8245`		`-echo "timestamp file" > src/include/stamp-h`
`8246`	`8248`
`8247`	`8249`	`exit 0`
`8248`	`8250`	`EOF`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1123,12 +1123,13 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then`
`1123`	`1123`	`AC_MSG_RESULT(done)`
`1124`	`1124`	`fi`
`1125`	`1125`
	`1126`	`+# (see Makefile.global)`
	`1127`	`+echo >src/include/stamp-h`
	`1128`	`+`
`1126`	`1129`	`AC_OUTPUT(`
`1127`	`1130`	`[`
`1128`	`1131`	`GNUmakefile`
`1129`	`1132`	`src/GNUmakefile`
`1130`	`1133`	`src/Makefile.global`
`1131`	`1134`	`src/backend/port/Makefile`
`1132`		`-],`
`1133`		`-[echo "timestamp file" > src/include/stamp-h]`
`1134`		`-)`
	`1135`	`+])`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.114 2000/11/30 20:36:10 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.115 2000/12/16 13:03:25 petere Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -313,6 +313,7 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_`
`313`	`313`	`$(top_builddir)/src/include/config.h:$(top_builddir)/src/include/stamp-h`
`314`	`314`	`$(top_builddir)/src/include/stamp-h:$(top_srcdir)/src/include/config.h.in$(top_builddir)/config.status`
`315`	`315`	`cd$(top_builddir)&& CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status`
	`316`	`+echo>$@`
`316`	`317`
`317`	`318`	`# When configure changes, rerun configure with the same options as`
`318`	`319`	`# last time. To change configure, you need to run autoconf manually.`

Comments

(0)