database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Remove USE_VPATH make variable from PGXS

Browse Source 
The user can just set VPATH directly.  There is no need to invent
another variable.
This commit is contained in:
Peter Eisentraut 2014-11-19 21:51:30 -05:00
parent 4e4b900249
commit e907997f42
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/extend.sgml
View File

@ -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
core script <filename>config/prep_buildtree</>. Once this has been done
you can build by setting the <literal>make</literal> variable
<varname>USE_VPATH</varname> like this:
<varname>VPATH</varname> like this:
<programlisting>
make USE_VPATH=/path/to/extension/source/tree
make USE_VPATH=/path/to/extension/source/tree install
make VPATH=/path/to/extension/source/tree
make VPATH=/path/to/extension/source/tree install
</programlisting>
This procedure can work with a greater variety of directory layouts.
</para>

9
src/makefiles/pgxs.mk
View File

@ -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 = .