mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

stamp-h needs to be made by config.status, not elsewhere, per recipe in

Browse Source 
Autoconf manual.  In particular, touching it before creating config.status
is guaranteed to lose.
This commit is contained in:
Tom Lane 2000-12-29 20:39:09 +00:00
parent b3c4f03c9c
commit b05b981924
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -7806,9 +7806,6 @@ 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
@ -8291,6 +8288,9 @@ cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
# Update timestamp for config.h (see Makefile.global)
echo >src/include/stamp-h
exit 0 exit 0
EOF EOF
chmod +x $CONFIG_STATUS chmod +x $CONFIG_STATUS

7
configure.in
View File

@ -1128,13 +1128,14 @@ 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
],
[
# Update timestamp for config.h (see Makefile.global)
echo >src/include/stamp-h
]) ])

12
src/Makefile.global.in
View File

@ -1,5 +1,5 @@
# -*-makefile-*- # -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.115 2000/12/16 13:03:25 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.116 2000/12/29 20:39:06 tgl 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,
@ -305,15 +305,17 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_
# Remake config.h from config.h.in if the latter changed. # Remake config.h from config.h.in if the latter changed.
# config.status will not change the timestamp on config.h if it # config.status will not change the timestamp on config.h if it
# doesn't change, so as to avoid recompiling the entire tree # doesn't change, so as to avoid recompiling the entire tree
# unnecessarily. Therefore config.status will update a timestamp file # unnecessarily. Therefore we make config.status update a timestamp file
# everytime it runs so that we don't trigger this rule everytime. # stamp-h everytime it runs, so that we don't trigger this rule everytime.
# (We do trigger the null rule for stamp-h to config.h everytime; so it's
# important for that rule to be null!)
# #
# Of course you need to turn on dependency tracking to get any # Of course you need to turn on dependency tracking to get any
# dependencies on config.h # dependencies on config.h.
$(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.