Skip to content

Commit c0a1d76

Browse files
committed
Use normal install program to install server headers.
Commit a703269 replaced $(INSTALL) with plain "cp" for installing the server header files. It sped up "make install" significantly, because the old logic called $(INSTALL) separately for every header file, whereas plain "cp" could copy all the files in one command. However, we have long since made it a requirement that $(INSTALL) can also install multiple files in one command, see commit f1c5247. Switch back to $(INSTALL). Discussion: https://www.postgresql.org/message-id/200503252305.j2PN52m23610%40candle.pha.pa.us Discussion: https://www.postgresql.org/message-id/2415283.1641852217%40sss.pgh.pa.us
1 parent e8d7858 commit c0a1d76

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/include/Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,15 @@ install: all installdirs
4848
$(INSTALL_DATA) utils/errcodes.h '$(DESTDIR)$(includedir_server)/utils'
4949
$(INSTALL_DATA) utils/fmgroids.h '$(DESTDIR)$(includedir_server)/utils'
5050
$(INSTALL_DATA) utils/fmgrprotos.h '$(DESTDIR)$(includedir_server)/utils'
51-
# We don't use INSTALL_DATA for performance reasons --- there are a lot of files
52-
# (in fact, we have to take some pains to avoid overlength shell commands here)
53-
cp $(srcdir)/*.h '$(DESTDIR)$(includedir_server)'/
51+
$(INSTALL_DATA) $(srcdir)/*.h '$(DESTDIR)$(includedir_server)'
5452
for dir in $(SUBDIRS); do \
55-
cp $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir/ || exit; \
53+
$(INSTALL_DATA) $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir || exit; \
5654
done
5755
ifeq ($(vpath_build),yes)
5856
for file in catalog/schemapg.h catalog/system_fk_info.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h; do \
59-
cp $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
57+
$(INSTALL_DATA) $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
6058
done
6159
endif
62-
cd '$(DESTDIR)$(includedir_server)' && chmod $(INSTALL_DATA_MODE) *.h
63-
for dir in $(SUBDIRS); do \
64-
cd '$(DESTDIR)$(includedir_server)'/$$dir || exit; \
65-
chmod $(INSTALL_DATA_MODE) *.h || exit; \
66-
done
6760

6861
installdirs:
6962
$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'

0 commit comments

Comments
 (0)