database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Revert "Backpatch pgxs vpath build and installation fixes."

Browse Source 
This reverts commit 1589246104.
This commit is contained in:
Andrew Dunstan
2013-09-30 00:08:37 -04:00
parent 1589246104
commit 03b6a6b48e
2 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.global.in
View File

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

58
src/makefiles/pgxs.mk
View File

@ -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
endif
@ -114,40 +102,33 @@ all: all-lib
endif # MODULE_big
install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs
install: all installdirs
ifneq (,$(EXTENSION))
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
endif # EXTENSION
ifneq (,$(DATA)$(DATA_built))
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
endif # DATA
ifneq (,$(DATA_TSEARCH))
$(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) $(addprefix $(srcdir)/, $(DOCS)) '$(DESTDIR)$(docdir)/$(docmoduledir)/'
endif # docdir
endif # DOCS
ifdef PROGRAM
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
endif # PROGRAM
installcontrol: $(addsuffix .control, $(EXTENSION))
ifneq (,$(EXTENSION))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
endif
installdata: $(DATA) $(DATA_built)
ifneq (,$(DATA)$(DATA_built))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
endif
installdatatsearch: $(DATA_TSEARCH)
ifneq (,$(DATA_TSEARCH))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
endif
installdocs: $(DOCS)
ifdef DOCS
ifdef docdir
$(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
endif # docdir
endif # DOCS
installscripts: $(SCRIPTS) $(SCRIPTS_built)
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
@ -272,7 +253,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