www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

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

Browse Source 
* 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
This commit is contained in:
Justin Erenkrantz
2005-09-30 13:01:39 +00:00
parent 638f93c818
commit c2a9a985f8
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@@ -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 \

1
acinclude.m4
View File

@@ -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)

1
configure.in
View File

@@ -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)