postgres.git / summary / log / commit / refs

commit    f3d7077dad94d6ac864647eaa50f5dd0590a6c8d
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Thu Dec 04 22:02:02 2014 +0000
First released in: 9.5.0, 9.4.0

    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.


 src/Makefile.global.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index d7a83c89a2d..377812ba1ae 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`
 


[parent: e907997f42fa]