Commit 2a81896a authored by Peter Eisentraut's avatar Peter Eisentraut

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

flawed because the timestamp file is already updated when Makefile.global
is remade, and the rule for config.h never gets run.
parent ad4fd77a
...@@ -7761,6 +7761,9 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then ...@@ -7761,6 +7761,9 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
echo "$ac_t""done" 1>&6 echo "$ac_t""done" 1>&6
fi fi
# (see Makefile.global)
echo >src/include/stamp-h
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
...@@ -8242,7 +8245,6 @@ cat >> $CONFIG_STATUS <<EOF ...@@ -8242,7 +8245,6 @@ cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
echo "timestamp file" > src/include/stamp-h
exit 0 exit 0
EOF EOF
......
...@@ -1123,12 +1123,13 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then ...@@ -1123,12 +1123,13 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
AC_MSG_RESULT(done) AC_MSG_RESULT(done)
fi fi
# (see Makefile.global)
echo >src/include/stamp-h
AC_OUTPUT( AC_OUTPUT(
[ [
GNUmakefile GNUmakefile
src/GNUmakefile src/GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
], ])
[echo "timestamp file" > src/include/stamp-h]
)
# -*-makefile-*- # -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.114 2000/11/30 20:36:10 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.115 2000/12/16 13:03:25 petere Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # 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,6 +313,7 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_
$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h $(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status $(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status
echo >$@
# When configure changes, rerun configure with the same options as # When configure changes, rerun configure with the same options as
# last time. To change configure, you need to run autoconf manually. # last time. To change configure, you need to run autoconf manually.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment