From b19a7e392a6ac2aa72f3556e6090bf010b858785 Mon Sep 17 00:00:00 2001 From: John Naylor Date: Mon, 14 Feb 2022 09:03:46 +0700 Subject: [PATCH] Correct Makefile dependencies for catalog scripts At some point, Gen_fmgrtab.pl stopped needing the value of defined symbols from access/transam.h, while genbki.pl starting doing so. The Makefiles didn't get the memo, so update the relevant dependencies. --- src/backend/catalog/Makefile | 2 +- src/backend/utils/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index df5268fbc3..eefebb7bb8 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -102,7 +102,7 @@ generated-header-symlinks: $(top_builddir)/src/include/catalog/header-stamp # configure run, even in distribution tarballs. So depending on configure.ac # instead is cheating a bit, but it will achieve the goal of updating the # version number when it changes. -bki-stamp: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(POSTGRES_BKI_DATA) $(top_srcdir)/configure.ac +bki-stamp: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(POSTGRES_BKI_DATA) $(top_srcdir)/configure.ac $(top_srcdir)/src/include/access/transam.h $(PERL) $< --include-path=$(top_srcdir)/src/include/ \ --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS) touch $@ diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 3bba26e5fb..ebda1df72b 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -47,7 +47,7 @@ $(SUBDIRS:%=%-recursive): fmgr-stamp errcodes.h # fmgr-stamp records the last time we ran Gen_fmgrtab.pl. We don't rely on # the timestamps of the individual output files, because the Perl script # won't update them if they didn't change (to avoid unnecessary recompiles). -fmgr-stamp: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.dat $(top_srcdir)/src/include/access/transam.h +fmgr-stamp: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.dat $(PERL) -I $(catalogdir) $< --include-path=$(top_srcdir)/src/include/ $(top_srcdir)/src/include/catalog/pg_proc.dat touch $@