Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6a74441

Browse files
committed
Make reformat-dat-files, reformat-dat-files VPATH safe.
The reformat_dat_file.pl script, added by 372728b, 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 372728b was merged
1 parent 34c9e45 commit 6a74441

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/include/catalog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ catalogdir = $(top_srcdir)/src/backend/catalog
2020
# catalog data files in our standard format. This includes collapsing
2121
# out any entries that are redundant with a BKI_DEFAULT annotation.
2222
reformat-dat-files:
23-
$(PERL) -I $(catalogdir) reformat_dat_file.pl pg_*.dat
23+
$(PERL) -I $(catalogdir) $(srcdir)/reformat_dat_file.pl -o $(srcdir) $(srcdir)/pg_*.dat
2424

2525
# 'make expand-dat-files' is a convenience target for expanding out all
2626
# default values in the catalog data files. This should be run before
2727
# altering or removing any BKI_DEFAULT annotation.
2828
expand-dat-files:
29-
$(PERL) -I $(catalogdir) reformat_dat_file.pl pg_*.dat --full-tuples
29+
$(PERL) -I $(catalogdir) $(srcdir)/reformat_dat_file.pl -o $(srcdir) $(srcdir)/pg_*.dat --full-tuples
3030

3131
.PHONY: reformat-dat-files expand-dat-files

0 commit comments

Comments
 (0)