diff options
| -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 a2d4ca26d8a..be102520131 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 8cf229e23cd..60cccddb72b 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -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 = . |