summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2012-01-29 20:11:55 +0000
committerStefan Fritsch <sf@apache.org>2012-01-29 20:11:55 +0000
commit4fca50f99735e584ba76d507a9343be791f5d024 (patch)
tree449c517ef54610b0195148bccc53481a485a0c4c /Makefile.in
parent95fba12ad8f284926bec1922cc06b1c70ac15089 (diff)
downloadhttpd-4fca50f99735e584ba76d507a9343be791f5d024.tar.gz
Install multiple files per install.sh invocation
Libtool and BSD install support installing several files in one run. Add support to install.sh and instdso.sh, too. Replace for-loops in the Makefiles. This reduces 'make install' time by approx. 50% because we save lots of calls to the huge libtool shell script. The AIX-specific magic in instdso.sh could use some testing. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1237447 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in22
1 files changed, 9 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 39a1b2e11a..31a59fc131 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,16 +102,14 @@ build/config_vars.out: build/config_vars.mk
@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
install-build: build/config_vars.out
- @echo Installing build system files
- @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
- @for f in $(top_srcdir)/build/*.mk build/*.mk; do \
- $(INSTALL_DATA) $$f $(DESTDIR)$(installbuilddir); \
- done
- @for f in $(top_builddir)/config.nice \
- $(top_srcdir)/build/mkdir.sh \
- $(top_srcdir)/build/instdso.sh; do \
- $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
- done
+ @echo Installing build system files
+ @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
+ @$(INSTALL_DATA) $(top_srcdir)/build/*.mk build/*.mk \
+ $(DESTDIR)$(installbuilddir)
+ @$(INSTALL_PROGRAM) $(top_builddir)/config.nice \
+ $(top_srcdir)/build/mkdir.sh \
+ $(top_srcdir)/build/instdso.sh \
+ $(DESTDIR)$(installbuilddir)
@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
@rm build/config_vars.out
@@ -218,9 +216,7 @@ INSTALL_HEADERS = \
install-include:
@echo Installing header files
@$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
- @for hdr in $(INSTALL_HEADERS); do \
- $(INSTALL_DATA) $$hdr $(DESTDIR)$(includedir); \
- done
+ @$(INSTALL_DATA) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
install-man:
@echo Installing man pages and online manual