8000 Revert haphazard pgxs makefile changes · postgres/postgres@e4b5a07 · GitHub
[go: up one dir, main page]
Skip to content

Commit e4b5a07

Browse files
peterepetere
committed
Revert haphazard pgxs makefile changes
These changes were originally submitted as "adds support for VPATH with USE_PGXS", but they are not necessary for VPATH support, so they just add more lines of code for no reason.
1 parent eb1c3f4 commit e4b5a07

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

‎src/makefiles/pgxs.mk

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -124,40 +124,33 @@ all: all-lib
124124
endif # MODULE_big
125125

126126

127-
install: all installdirs installcontrol installdata installdatatsearch installdocs installscripts
128-
ifdef MODULES
129-
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
130-
endif # MODULES
131-
ifdef PROGRAM
132-
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
133-
endif # PROGRAM
134-
135-
installcontrol: $(addsuffix .control, $(EXTENSION)) | installdirs
127+
install: all installdirs
136128
ifneq (,$(EXTENSION))
137-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
138-
endif
139-
140-
installdata: $(DATA) $(DATA_built) | installdirs
129+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
130+
endif # EXTENSION
141131
ifneq (,$(DATA)$(DATA_built))
142-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
143-
endif
144-
145-
installdatatsearch: $(DATA_TSEARCH) | installdirs
132+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
133+
endif # DATA
146134
ifneq (,$(DATA_TSEARCH))
147-
$(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
148-
endif
149-
150-
installdocs: $(DOCS) | installdirs
135+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA_TSEARCH)) '$(DESTDIR)$(datadir)/tsearch_data/'
136+
endif # DATA_TSEARCH
137+
ifdef MODULES
138+
$(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
139+
endif # MODULES
151140
ifdef DOCS
152141
ifdef docdir
153-
$(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
142+
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DOCS)) '$(DESTDIR)$(docdir)/$(docmoduledir)/'
154143
endif # docdir
155144
endif # DOCS
156-
157-
installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs
145+
ifdef PROGRAM
146+
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
147+
endif # PROGRAM
158148
ifdef SCRIPTS
159-
$(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
149+
$(INSTALL_SCRIPT) $(addprefix $(srcdir)/, $(SCRIPTS)) '$(DESTDIR)$(bindir)/'
160150
endif # SCRIPTS
151+
ifdef SCRIPTS_built
152+
$(INSTALL_SCRIPT) $(SCRIPTS_built) '$(DESTDIR)$(bindir)/'
153+
endif # SCRIPTS_built
161154

162155
ifdef MODULE_big
163156
install: install-lib

0 commit comments

Comments
 (0)
0