summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2018-11-15 11:35:07 -0800
committerAndres Freund <andres@anarazel.de>2018-11-15 11:38:03 -0800
commit8fbb2a92e014fea609988ed665133333ebf42d39 (patch)
tree6d5aeb71dbfb93e72656252447f8519b880ee7e1
parente8ba27a4ce7ff4ebed09eeb2dc6cef8b35a590ed (diff)
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
-rw-r--r--src/include/catalog/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/catalog/Makefile b/src/include/catalog/Makefile
index 1da3ea7f441..c545c6bcdcb 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