Skip to content

Commit 2a81896

Browse files
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.global is remade, and the rule for config.h never gets run.
1 parent ad4fd77 commit 2a81896

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7761,6 +7761,9 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
77617761
echo "$ac_t""done" 1>&6
77627762
fi
77637763

7764+
# (see Makefile.global)
7765+
echo >src/include/stamp-h
7766+
77647767
trap '' 1 2 15
77657768
cat > confcache <<\EOF
77667769
# This file is a shell script that caches the results of configure
@@ -8242,7 +8245,6 @@ cat >> $CONFIG_STATUS <<EOF
82428245
82438246
EOF
82448247
cat >> $CONFIG_STATUS <<\EOF
8245-
echo "timestamp file" > src/include/stamp-h
82468248
82478249
exit 0
82488250
EOF

configure.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,12 +1123,13 @@ if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
11231123
AC_MSG_RESULT(done)
11241124
fi
11251125

1126+
# (see Makefile.global)
1127+
echo >src/include/stamp-h
1128+
11261129
AC_OUTPUT(
11271130
[
11281131
GNUmakefile
11291132
src/GNUmakefile
11301133
src/Makefile.global
11311134
src/backend/port/Makefile
1132-
],
1133-
[echo "timestamp file" > src/include/stamp-h]
1134-
)
1135+
])

src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-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 $
33

44
#------------------------------------------------------------------------------
55
# 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_
313313
$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h
314314
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status
315315
cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status
316+
echo >$@
316317

317318
# When configure changes, rerun configure with the same options as
318319
# last time. To change configure, you need to run autoconf manually.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy