diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-11-19 22:26:32 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 08:07:59 -0500 |
| commit | e4b5a070b4d25da2c2f80af306fa1d19044370ae (patch) | |
| tree | 729add695b02a59467a0e767d655daa1d1c7a16d | |
| parent | eb1c3f478645cbbd39877c2a8432f2f8c722eed2 (diff) | |
| download | postgresql-e4b5a070b4d25da2c2f80af306fa1d19044370ae.tar.gz postgresql-e4b5a070b4d25da2c2f80af306fa1d19044370ae.zip | |
Revert haphazard pgxs makefile changes
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.
| -rw-r--r-- | src/makefiles/pgxs.mk | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 8e76c6691bf..24ddba9294b 100644 --- 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 |