We don't want to install CVS files, but the -P option to cp means something

different on FreeBSD than it means on Linux.  This puts the recursive
copy back in, and just has us delete the CVS directories after they are
copied into place.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87541 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 72e6a90576a7e73e5c7cc8b3cfe2c4e3dc295123..d29aaf4d041fad46515be31d0dd55628398cac36 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,19 +53,22 @@ docs: include/*.h
 install-htdocs:
        @echo Installing HTML documents
        @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
-       @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && find . ! -path '*CVS*' -a ! -type d -exec cp -Pp {}  $(htdocsdir) \;)
+       @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
        @test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
-       @test -d docs/manual && (cd docs/manual && find . ! -path '*CVS*' -a ! -type d -exec cp -Pp {} $(htdocsdir)/manual \;)
+       @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+       @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-icons:
        @echo Installing icons
        @test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
-       @(cd docs/icons && find . ! -path '*CVS*' -a ! -type d -exec cp -Pp {}  $(iconsdir) \;)
+       @(cd docs/icons && cp -rp * $(iconsdir))
+       @(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-cgi:
        @echo Installing CGIs
        @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
-       @(cd docs/cgi-examples && find . ! -path '*CVS*' -a ! -type d -exec cp -Pp {} $(cgidir) \;)
+       @(cd docs/cgi-examples && cp -rp * $(cgidir))
+       @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-support:
        @echo Installing Support Binaries