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.
REL7_1_STABLE
Peter Eisentraut 25 years ago
parent ad4fd77a5f
commit 2a81896a2a
  1. 4
      configure
  2. 7
      configure.in
  3. 3
      src/Makefile.global.in

4
configure vendored

@ -7761,6 +7761,9 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
echo "$ac_t""done" 1>&6
fi
# (see Makefile.global)
echo >src/include/stamp-h
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@ -8242,7 +8245,6 @@ cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
echo "timestamp file" > src/include/stamp-h
exit 0
EOF

@ -1123,12 +1123,13 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
AC_MSG_RESULT(done)
fi
# (see Makefile.global)
echo >src/include/stamp-h
AC_OUTPUT(
[
GNUmakefile
src/GNUmakefile
src/Makefile.global
src/backend/port/Makefile
],
[echo "timestamp file" > src/include/stamp-h]
)
])

@ -1,5 +1,5 @@
# -*-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,
@ -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/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
echo >$@
# When configure changes, rerun configure with the same options as
# last time. To change configure, you need to run autoconf manually.

Loading…
Cancel
Save