Commit6a74441

committed

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

The reformat_dat_file.pl script, added by372728b, supportedall the necessary options to make it work in a VPATH build, but themakefile invocations didn't take VPATH into account. Fix that.Discussion:https://postgr.es/m/20181115185303.d2z7wonx23mdfvd3@alap3.anarazel.deBackpatch: 11-, where372728b was merged

1 parent34c9e45 commit6a74441Copy full SHA for 6a74441

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ catalogdir = $(top_srcdir)/src/backend/catalog`
`20`	`20`	`# catalog data files in our standard format. This includes collapsing`
`21`	`21`	`# out any entries that are redundant with a BKI_DEFAULT annotation.`
`22`	`22`	`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`
`24`	`24`
`25`	`25`	`# 'make expand-dat-files' is a convenience target for expanding out all`
`26`	`26`	`# default values in the catalog data files. This should be run before`
`27`	`27`	`# altering or removing any BKI_DEFAULT annotation.`
`28`	`28`	`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`
`30`	`30`
`31`	`31`	`.PHONY: reformat-dat-files expand-dat-files`

Comments

(0)