From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 9 May 2012 17:45:56 +0000 (+0300)
Subject: Add make dependency so that postgres.bki is rebuilt in major version change
X-Git-Tag: REL9_2_BETA1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d39807a008a5a73999477a7b3c21b2165fee549;p=postgresql

Add make dependency so that postgres.bki is rebuilt in major version change

Every time since the current rule for postgres.bki was put in place
when we change the major version, people complain that their tests
fail in strange ways.  This is because the version number in
postgres.bki is not updated, because it has no dependency for that.
And you can't even force the rebuild manually if you don't happen to
know which file has the problem.  Fix that now before it will happen
again.

The only remaining problem with switching major versions, as far as
the regression tests are concerned, is that contrib needs to be
rebuilt.  But that's easily invoked, and in any case the failure modes
are more friendly if you forget that.
---

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 5a4419d3a8..62fc9b0466 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -56,7 +56,12 @@ postgres.shdescription: postgres.bki ;
 
 schemapg.h: postgres.bki ;
 
-postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)
+# Technically, this should depend on Makefile.global, but then
+# postgres.bki would need to be rebuilt after every configure run,
+# even in distribution tarballs.  So this is cheating a bit, but it
+# will achieve the goal of updating the version number when it
+# changes.
+postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(top_srcdir)/configure
 	$(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
 
 .PHONY: install-data