From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 4 Dec 2014 22:02:02 +0000 (-0500)
Subject: Fix PGXS vpath build when PostgreSQL is built with vpath
X-Git-Tag: REL9_5_ALPHA1~1103
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=b58233c71b93a32fcab7219585cafc25a27eb769;p=postgresql.git

Fix PGXS vpath build when PostgreSQL is built with vpath

PGXS computes srcdir from VPATH, PostgreSQL proper computes VPATH from
srcdir, and doing both results in an error from make.  Conditionalize so
only one of these takes effect.
---

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a78f4d34f89..ba5aef9ea47 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -40,6 +40,8 @@ VERSION = @PACKAGE_VERSION@
 MAJORVERSION = @PG_MAJORVERSION@
 
 # Support for VPATH builds
+# (PGXS VPATH support is handled separately in pgxs.mk)
+ifndef PGXS
 vpath_build = @vpath_build@
 abs_top_srcdir = @abs_top_srcdir@
 
@@ -51,6 +53,7 @@ top_srcdir = $(abs_top_srcdir)
 srcdir = $(top_srcdir)/$(subdir)
 VPATH = $(srcdir)
 endif
+endif # not PGXS
 
 vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done`