summaryrefslogtreecommitdiff
path: root/src/makefiles
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2014-11-19 21:51:30 -0500
committerPeter Eisentraut <peter_e@gmx.net>2014-12-04 08:07:41 -0500
commiteb1c3f478645cbbd39877c2a8432f2f8c722eed2 (patch)
treee9e1eae1d026481590bab5fe35bb07e53acd00a1 /src/makefiles
parent1e95bbc870ccb4dc4ac8d43b0a4ed3661415f148 (diff)
downloadpostgresql-eb1c3f478645cbbd39877c2a8432f2f8c722eed2.tar.gz
Remove USE_VPATH make variable from PGXS
The user can just set VPATH directly. There is no need to invent another variable.
Diffstat (limited to 'src/makefiles')
-rw-r--r--src/makefiles/pgxs.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 94ead5f794..8e76c6691b 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -63,11 +63,10 @@ top_builddir := $(dir $(PGXS))../..
include $(top_builddir)/src/Makefile.global
top_srcdir = $(top_builddir)
-# If USE_VPATH is set or Makefile is not in current directory we are building
-# the extension with VPATH so we set the variable here
-ifdef USE_VPATH
-srcdir = $(USE_VPATH)
-VPATH = $(USE_VPATH)
+# If VPATH is set or Makefile is not in current directory we are building
+# the extension with VPATH so we set the variable here.
+ifdef VPATH
+srcdir = $(VPATH)
else
ifeq ($(CURDIR),$(dir $(firstword $(MAKEFILE_LIST))))
srcdir = .