diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2013-09-30 10:17:30 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2013-09-30 10:17:30 -0400 |
| commit | eebdea08bb6c185dd7e7542f35565a2c12ab1342 (patch) | |
| tree | 8cbbfd2549854f895144753461c2dc9736c0435c /src | |
| parent | ee01d848f39400c8524c66944ada6fde47894978 (diff) | |
| download | postgresql-eebdea08bb6c185dd7e7542f35565a2c12ab1342.tar.gz postgresql-eebdea08bb6c185dd7e7542f35565a2c12ab1342.zip | |
Ensure installation dirs are built before contents are installed (v2)
Push dependency on installdirs down to individual targets.
Christoph Berg
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefiles/pgxs.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index ac12f7d3db9..8cf229e23cd 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -124,7 +124,7 @@ all: all-lib endif # MODULE_big -install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs +install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts ifdef MODULES $(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/' endif # MODULES @@ -132,29 +132,29 @@ ifdef PROGRAM $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)' endif # PROGRAM -installcontrol: $(addsuffix .control, $(EXTENSION)) +installcontrol: $(addsuffix .control, $(EXTENSION)) | installdirs ifneq (,$(EXTENSION)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/' endif -installdata: $(DATA) $(DATA_built) +installdata: $(DATA) $(DATA_built) | installdirs ifneq (,$(DATA)$(DATA_built)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/' endif -installdatatsearch: $(DATA_TSEARCH) +installdatatsearch: $(DATA_TSEARCH) | installdirs ifneq (,$(DATA_TSEARCH)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/' endif -installdocs: $(DOCS) +installdocs: $(DOCS) | installdirs ifdef DOCS ifdef docdir $(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/' endif # docdir endif # DOCS -installscripts: $(SCRIPTS) $(SCRIPTS_built) +installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs ifdef SCRIPTS $(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/' endif # SCRIPTS |