From: Ryan Bloom <rbb@apache.org>
Date: Thu, 28 Dec 2000 06:08:30 +0000 (+0000)
Subject: We don't want to install CVS files, but the -P option to cp means something
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4645a9805d34877cf676a9d43bd377d457c8cd65;p=apache

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 72e6a90576..d29aaf4d04 100644
--- 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