Commit eb1c3f47 authored by Peter Eisentraut's avatar Peter Eisentraut

Remove USE_VPATH make variable from PGXS

The user can just set VPATH directly.  There is no need to invent
another variable.
parent 1e95bbc8
...@@ -1180,10 +1180,10 @@ make -f /path/to/extension/source/tree/Makefile install ...@@ -1180,10 +1180,10 @@ make -f /path/to/extension/source/tree/Makefile install
way to how it is done for the core code. One way to do this is using the way to how it is done for the core code. One way to do this is using the
core script <filename>config/prep_buildtree</>. Once this has been done core script <filename>config/prep_buildtree</>. Once this has been done
you can build by setting the <literal>make</literal> variable you can build by setting the <literal>make</literal> variable
<varname>USE_VPATH</varname> like this: <varname>VPATH</varname> like this:
<programlisting> <programlisting>
make USE_VPATH=/path/to/extension/source/tree make VPATH=/path/to/extension/source/tree
make USE_VPATH=/path/to/extension/source/tree install make VPATH=/path/to/extension/source/tree install
</programlisting> </programlisting>
This procedure can work with a greater variety of directory layouts. This procedure can work with a greater variety of directory layouts.
</para> </para>
......
...@@ -63,11 +63,10 @@ top_builddir := $(dir $(PGXS))../.. ...@@ -63,11 +63,10 @@ top_builddir := $(dir $(PGXS))../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
top_srcdir = $(top_builddir) top_srcdir = $(top_builddir)
# If USE_VPATH is set or Makefile is not in current directory we are building # If VPATH is set or Makefile is not in current directory we are building
# the extension with VPATH so we set the variable here # the extension with VPATH so we set the variable here.
ifdef USE_VPATH ifdef VPATH
srcdir = $(USE_VPATH) srcdir = $(VPATH)
VPATH = $(USE_VPATH)
else else
ifeq ($(CURDIR),$(dir $(firstword $(MAKEFILE_LIST)))) ifeq ($(CURDIR),$(dir $(firstword $(MAKEFILE_LIST))))
srcdir = . srcdir = .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment