Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eebdea0

Browse files
committed
Ensure installation dirs are built before contents are installed (v2)
Push dependency on installdirs down to individual targets. Christoph Berg
1 parent ee01d84 commit eebdea0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/makefiles/pgxs.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,37 +124,37 @@ all: all-lib
124124
endif # MODULE_big
125125

126126

127-
install: all installcontrol installdata installdatatsearch installdocs installscripts | installdirs
127+
install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts
128128
ifdef MODULES
129129
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
130130
endif # MODULES
131131
ifdef PROGRAM
132132
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
133133
endif # PROGRAM
134134

135-
installcontrol: $(addsuffix .control, $(EXTENSION))
135+
installcontrol: $(addsuffix .control, $(EXTENSION)) | installdirs
136136
ifneq (,$(EXTENSION))
137137
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
138138
endif
139139

140-
installdata: $(DATA) $(DATA_built)
140+
installdata: $(DATA) $(DATA_built) | installdirs
141141
ifneq (,$(DATA)$(DATA_built))
142142
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
143143
endif
144144

145-
installdatatsearch: $(DATA_TSEARCH)
145+
installdatatsearch: $(DATA_TSEARCH) | installdirs
146146
ifneq (,$(DATA_TSEARCH))
147147
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
148148
endif
149149

150-
installdocs: $(DOCS)
150+
installdocs: $(DOCS) | installdirs
151151
ifdef DOCS
152152
ifdef docdir
153153
$(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
154154
endif # docdir
155155
endif # DOCS
156156

157-
installscripts: $(SCRIPTS) $(SCRIPTS_built)
157+
installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs
158158
ifdef SCRIPTS
159159
$(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
160160
endif # SCRIPTS

0 commit comments

Comments
 (0)