diff options
| author | Peter Eisentraut | 2013-10-08 02:31:31 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2013-10-08 02:31:31 +0000 |
| commit | 4b414606753498095306132a5b75cb900c6381fe (patch) | |
| tree | 1282a711f5a2b0d127c343b0bd75300212cfbc66 | |
| parent | 2589a5a59b9023b66710227750dab15cec68310f (diff) | |
Revert "Ensure installation dirs are built before contents are installed (v2)"
This reverts commit 7f165f2587f6dafe7d4d438136dd959ed5610979.
pending resolution of
http://www.postgresql.org/message-id/1381193255.25702.4.camel@vanquo.pezone.net
| -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 8cf229e23cd..ac12f7d3db9 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -124,7 +124,7 @@ all: all-lib endif # MODULE_big -install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts +install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs 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)) | installdirs +installcontrol: $(addsuffix .control, $(EXTENSION)) ifneq (,$(EXTENSION)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/' endif -installdata: $(DATA) $(DATA_built) | installdirs +installdata: $(DATA) $(DATA_built) ifneq (,$(DATA)$(DATA_built)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/' endif -installdatatsearch: $(DATA_TSEARCH) | installdirs +installdatatsearch: $(DATA_TSEARCH) ifneq (,$(DATA_TSEARCH)) $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/' endif -installdocs: $(DOCS) | installdirs +installdocs: $(DOCS) ifdef DOCS ifdef docdir $(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/' endif # docdir endif # DOCS -installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs +installscripts: $(SCRIPTS) $(SCRIPTS_built) ifdef SCRIPTS $(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/' endif # SCRIPTS |