mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure installation dirs are built before contents are installed (v2)

Browse Source 
Push dependency on installdirs down to individual targets.

Christoph Berg
This commit is contained in:
Andrew Dunstan 2013-09-30 10:17:30 -04:00
parent ee01d848f3
commit eebdea08bb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/makefiles/pgxs.mk
View File

@ -124,7 +124,7 @@ all: all-lib
endif # MODULE_big endif # MODULE_big
install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts
ifdef MODULES ifdef MODULES
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/' $(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
endif # MODULES endif # MODULES
@ -132,29 +132,29 @@ ifdef PROGRAM
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)' $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
endif # PROGRAM endif # PROGRAM
installcontrol: $(addsuffix .control, $(EXTENSION)) installcontrol: $(addsuffix .control, $(EXTENSION)) | installdirs
ifneq (,$(EXTENSION)) ifneq (,$(EXTENSION))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/' $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
endif endif
installdata: $(DATA) $(DATA_built) installdata: $(DATA) $(DATA_built) | installdirs
ifneq (,$(DATA)$(DATA_built)) ifneq (,$(DATA)$(DATA_built))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/' $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
endif endif
installdatatsearch: $(DATA_TSEARCH) installdatatsearch: $(DATA_TSEARCH) | installdirs
ifneq (,$(DATA_TSEARCH)) ifneq (,$(DATA_TSEARCH))
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/' $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
endif endif
installdocs: $(DOCS) installdocs: $(DOCS) | installdirs
ifdef DOCS ifdef DOCS
ifdef docdir ifdef docdir
$(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/' $(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
endif # docdir endif # docdir
endif # DOCS endif # DOCS
installscripts: $(SCRIPTS) $(SCRIPTS_built) installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs
ifdef SCRIPTS ifdef SCRIPTS
$(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/' $(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
endif # SCRIPTS endif # SCRIPTS