diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2005-09-30 13:01:39 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2005-09-30 13:01:39 +0000 |
| commit | c2a9a985f8c19afe928e1b00160c3f5224956c25 (patch) | |
| tree | 9243372624c909aa5f5c5d1a513e11e0b8f6c6bf /Makefile.in | |
| parent | 638f93c818abe4860a189950d219ed45ef7121e6 (diff) | |
| download | httpd-c2a9a985f8c19afe928e1b00160c3f5224956c25.tar.gz | |
Use rsync to install manual and htdocs to speed up installation times.
* Makefile.in: Update install-man and install-htdocs to use rsync if available,
otherwise fail back to current cp -rp and rm -rf .svn/ strategy.
* configure.in: Look for rsync.
* acinclude.m4: Include RSYNC in exported config_vars.mk
(Incorporates suggestions on rsync flags from colm.)
Reviewed by: colm, trawick (concept), niq (concept)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292718 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 4e04dd0568..6cfe9639ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,8 +122,12 @@ install-htdocs: else \ echo Installing HTML documents ; \ $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ - cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ + if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ + else \ + test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ + cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ + fi; \ fi install-error: @@ -201,8 +205,12 @@ install-man: @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 - @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ + cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \ + fi install-suexec: @if test -f $(builddir)/support/suexec; then \ |