From e907997f42faada60e5a26b116cc0b79b69309d1 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 19 Nov 2014 21:51:30 -0500 Subject: Remove USE_VPATH make variable from PGXS The user can just set VPATH directly. There is no need to invent another variable. --- src/makefiles/pgxs.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 8cf229e23cd..60cccddb72b 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -62,11 +62,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 = . -- cgit v1.2.3