From 8fbb2a92e014fea609988ed665133333ebf42d39 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 15 Nov 2018 11:35:07 -0800 Subject: [PATCH] Make reformat-dat-files, reformat-dat-files VPATH safe. The reformat_dat_file.pl script, added by 372728b0d49552641, supported all the necessary options to make it work in a VPATH build, but the makefile invocations didn't take VPATH into account. Fix that. Discussion: https://postgr.es/m/20181115185303.d2z7wonx23mdfvd3@alap3.anarazel.de Backpatch: 11-, where 372728b0d49552641 was merged --- src/include/catalog/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/catalog/Makefile b/src/include/catalog/Makefile index 1da3ea7f44..c545c6bcdc 100644 --- a/src/include/catalog/Makefile +++ b/src/include/catalog/Makefile @@ -20,12 +20,12 @@ catalogdir = $(top_srcdir)/src/backend/catalog # catalog data files in our standard format. This includes collapsing # out any entries that are redundant with a BKI_DEFAULT annotation. reformat-dat-files: - $(PERL) -I $(catalogdir) reformat_dat_file.pl pg_*.dat + $(PERL) -I $(catalogdir) $(srcdir)/reformat_dat_file.pl -o $(srcdir) $(srcdir)/pg_*.dat # 'make expand-dat-files' is a convenience target for expanding out all # default values in the catalog data files. This should be run before # altering or removing any BKI_DEFAULT annotation. expand-dat-files: - $(PERL) -I $(catalogdir) reformat_dat_file.pl pg_*.dat --full-tuples + $(PERL) -I $(catalogdir) $(srcdir)/reformat_dat_file.pl -o $(srcdir) $(srcdir)/pg_*.dat --full-tuples .PHONY: reformat-dat-files expand-dat-files