git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Peter Eisentraut <peter_e@gmx.net>

2014年11月20日 03:26:32 +0000 (22:26 -0500)

committer Peter Eisentraut <peter_e@gmx.net>

Thu, 4 Dec 2014 13:07:59 +0000 (08:07 -0500)

These changes were originally submitted as "adds support for VPATH with
USE_PGXS", but they are not necessary for VPATH support, so they just
add more lines of code for no reason.

src/makefiles/pgxs.mk patch | blob | blame | history

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk

index 8e76c6691bfe0c09e3f49e829bf1458010869542..24ddba9294bf614111c2a26266d78ea8ada89aa3 100644 (file)

--- a/src/makefiles/pgxs.mk

+++ b/src/makefiles/pgxs.mk

@@ -124,40 +124,33 @@ all: all-lib

endif # MODULE_big

-install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts

-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)) | installdirs

+install: all installdirs

ifneq (,$(EXTENSION))

- $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'

-endif

-installdata: $(DATA) $(DATA_built) | installdirs

+ $(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) | installdirs

+ $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'

+endif # DATA

ifneq (,$(DATA_TSEARCH))

- $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'

-endif

-installdocs: $(DOCS) | installdirs

+ $(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) | installdirs

+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

This is the main PostgreSQL git repository.

RSS Atom