diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 17:02:02 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 17:03:37 -0500 |
| commit | f3d7077dad94d6ac864647eaa50f5dd0590a6c8d (patch) | |
| tree | 6dc7f377909aa2160649cde76475f1a98e6d84a1 | |
| parent | e907997f42faada60e5a26b116cc0b79b69309d1 (diff) | |
| download | postgresql-f3d7077dad94d6ac864647eaa50f5dd0590a6c8d.tar.gz postgresql-f3d7077dad94d6ac864647eaa50f5dd0590a6c8d.zip | |
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.
| -rw-r--r-- | src/Makefile.global.in | 3 |
1 files changed, 3 insertions, 0 deletions
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` |