Commite907997

committed

Remove USE_VPATH make variable from PGXS

The user can just set VPATH directly. There is no need to inventanother variable.

1 parent4e4b900 commite907997Copy full SHA for e907997

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1180,10 +1180,10 @@ make -f /path/to/extension/source/tree/Makefile install`
`1180`	`1180`	`way to how it is done for the core code. One way to do this is using the`
`1181`	`1181`	`core script <filename>config/prep_buildtree</>. Once this has been done`
`1182`	`1182`	`you can build by setting the <literal>make</literal> variable`
`1183`		`- <varname>USE_VPATH</varname> like this:`
	`1183`	`+ <varname>VPATH</varname> like this:`
`1184`	`1184`	`<programlisting>`
`1185`		`-makeUSE_VPATH=/path/to/extension/source/tree`
`1186`		`-makeUSE_VPATH=/path/to/extension/source/tree install`
	`1185`	`+makeVPATH=/path/to/extension/source/tree`
	`1186`	`+makeVPATH=/path/to/extension/source/tree install`
`1187`	`1187`	`</programlisting>`
`1188`	`1188`	`This procedure can work with a greater variety of directory layouts.`
`1189`	`1189`	`</para>`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,10 @@ top_builddir := $(dir $(PGXS))../..`
`62`	`62`	`include$(top_builddir)/src/Makefile.global`
`63`	`63`
`64`	`64`	`top_srcdir =$(top_builddir)`
`65`		`-# If USE_VPATH is set or Makefile is not in current directory we are building`
`66`		`-# the extension with VPATH so we set the variable here`
`67`		`-ifdefUSE_VPATH`
`68`		`-srcdir =$(USE_VPATH)`
`69`		`-VPATH =$(USE_VPATH)`
	`65`	`+# If VPATH is set or Makefile is not in current directory we are building`
	`66`	`+# the extension with VPATH so we set the variable here.`
	`67`	`+ifdefVPATH`
	`68`	`+srcdir =$(VPATH)`
`70`	`69`	`else`
`71`	`70`	`ifeq ($(CURDIR),$(dir$(firstword$(MAKEFILE_LIST))))`
`72`	`71`	`srcdir = .`

Comments

(0)