diff options
| author | Peter Eisentraut | 2014-11-20 02:51:30 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2014-12-04 13:07:41 +0000 |
| commit | eb1c3f478645cbbd39877c2a8432f2f8c722eed2 (patch) | |
| tree | e9e1eae1d026481590bab5fe35bb07e53acd00a1 | |
| parent | 1e95bbc870ccb4dc4ac8d43b0a4ed3661415f148 (diff) | |
Remove USE_VPATH make variable from PGXS
The user can just set VPATH directly. There is no need to invent
another variable.
| -rw-r--r-- | doc/src/sgml/extend.sgml | 6 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index a2d4ca26d8..be10252013 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -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> diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 94ead5f794..8e76c6691b 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -63,11 +63,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 = . |