rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-06 19:06:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 7f165f2587.

pending resolution of
http://www.postgresql.org/message-id/1381193255.25702.4.camel@vanquo.pezone.net
This commit is contained in:
Peter Eisentraut 2013-10-07 22:31:31 -04:00
parent 2589a5a59b
commit 4b41460675
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
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