Commit 6a744413 authored by Andres Freund's avatar Andres Freund

Make reformat-dat-files, reformat-dat-files VPATH safe.

The reformat_dat_file.pl script, added by 372728b0, 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 372728b0 was merged
parent 34c9e455
...@@ -20,12 +20,12 @@ catalogdir = $(top_srcdir)/src/backend/catalog ...@@ -20,12 +20,12 @@ catalogdir = $(top_srcdir)/src/backend/catalog
# catalog data files in our standard format. This includes collapsing # catalog data files in our standard format. This includes collapsing
# out any entries that are redundant with a BKI_DEFAULT annotation. # out any entries that are redundant with a BKI_DEFAULT annotation.
reformat-dat-files: 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 # 'make expand-dat-files' is a convenience target for expanding out all
# default values in the catalog data files. This should be run before # default values in the catalog data files. This should be run before
# altering or removing any BKI_DEFAULT annotation. # altering or removing any BKI_DEFAULT annotation.
expand-dat-files: 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 .PHONY: reformat-dat-files expand-dat-files
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment