Revert "Backpatch pgxs vpath build and installation fixes."

This reverts commit cd453fef0bcfdc3c79c884e971cb84b88cb9d28d.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a931ceae83058486e9e9a64d95450be8db112f88..b10ce3071638d527b1880996430fe12bb775189c 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -415,22 +415,12 @@ else
 libpq_pgport = -L$(top_builddir)/src/port -lpgport $(libpq)
 endif
 
-# If PGXS is not defined, build libpq and libpgport dependancies as required.
-# If the build is with PGXS, then these are supposed to be already built and
-# installed, and we just ensure that the expected files exist.
-ifndef PGXS
+
 submake-libpq:
        $(MAKE) -C $(libpq_builddir) all
-else
-submake-libpq: $(libdir)/libpq.so ;
-endif
 
-ifndef PGXS
 submake-libpgport:
        $(MAKE) -C $(top_builddir)/src/port all
-else
-submake-libpgport: $(libdir)/libpgport.a
-endif
 
 .PHONY: submake-libpq submake-libpgport
 

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index ac12f7d3db9ba4e21150b667b0fdaabc81cb6f8a..bbcfe048644b4bf68143f30ff5af1e793c2dec6a 100644 (file)
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -62,20 +62,8 @@ 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)
-else
-ifeq ($(CURDIR),$(dir $(firstword $(MAKEFILE_LIST))))
 srcdir = .
 VPATH =
-else
-srcdir = $(dir $(firstword $(MAKEFILE_LIST)))
-VPATH = $(srcdir)
-endif
-endif
 
 # These might be set in Makefile.global, but if they were not found
 # during the build of PostgreSQL, supply default values so that users
@@ -124,40 +112,33 @@ all: all-lib
 endif # MODULE_big
 
 
-install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs
-ifdef MODULES
-       $(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
-endif # MODULES
-ifdef PROGRAM
-       $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
-endif # PROGRAM
-
-installcontrol: $(addsuffix .control, $(EXTENSION))
+install: all installdirs
 ifneq (,$(EXTENSION))
-       $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
-endif
-
-installdata: $(DATA) $(DATA_built)
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
+endif # EXTENSION
 ifneq (,$(DATA)$(DATA_built))
-       $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
-endif
-
-installdatatsearch: $(DATA_TSEARCH)
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
+endif # DATA
 ifneq (,$(DATA_TSEARCH))
-       $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
-endif
-
-installdocs: $(DOCS)
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA_TSEARCH)) '$(DESTDIR)$(datadir)/tsearch_data/'
+endif # DATA_TSEARCH
+ifdef MODULES
+       $(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
+endif # MODULES
 ifdef DOCS
 ifdef docdir
-       $(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DOCS)) '$(DESTDIR)$(docdir)/$(docmoduledir)/'
 endif # docdir
 endif # DOCS
-
-installscripts: $(SCRIPTS) $(SCRIPTS_built)
+ifdef PROGRAM
+       $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
+endif # PROGRAM
 ifdef SCRIPTS
-       $(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
+       $(INSTALL_SCRIPT) $(addprefix $(srcdir)/, $(SCRIPTS)) '$(DESTDIR)$(bindir)/'
 endif # SCRIPTS
+ifdef SCRIPTS_built
+       $(INSTALL_SCRIPT) $(SCRIPTS_built) '$(DESTDIR)$(bindir)/'
+endif # SCRIPTS_built
 
 ifdef MODULE_big
 install: install-lib
@@ -282,7 +263,6 @@ test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src)
 
 all: $(test_files_build)
 $(test_files_build): $(abs_builddir)/%: $(srcdir)/%
-       $(MKDIR_P) $(dir $@)
        ln -s $< $@
 endif # VPATH