Merge r292718:

Use rsync to install manual and htdocs to speed up installation times.

See log of 292718 for full description.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332907 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 1f4181bb66f6e6a705da4bb731d3d8ca7c6f6460..bea60bef24c458fbf804331ceacb04e92c140a1d 100644 (file)
--- 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:
@@ -202,8 +206,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 \

diff --git a/acinclude.m4 b/acinclude.m4
index 360a47279e2054b0cbc25b320e9e51904e2cf777..742711fa8d40572e000e7e20027fd751da989fa7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -75,6 +75,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(EXTRA_INCLUDES)
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)
+  APACHE_SUBST(RSYNC)
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)

diff --git a/configure.in b/configure.in
index a48136c9c7f842c1d82eca324fac394a671ff290..2a3d1d94a13a46539dc1d8ccaa814320276bcc9a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -297,6 +297,7 @@ dnl ## Check for programs
 
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(PKGCONFIG, pkg-config)
+AC_PATH_PROG(RSYNC, rsync)
 AC_PROG_AWK
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)