From: Aaron Bannert <aaron@apache.org>
Date: Thu, 7 Mar 2002 15:06:07 +0000 (+0000)
Subject: It is bad to recursively remove every CVS directory in a person's
X-Git-Tag: CHANGES~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeba70f8e412c99d68f28186ed47eba436954eb1;p=thirdparty%2Fapache%2Fhttpd.git

It is bad to recursively remove every CVS directory in a person's
home directory. Bad bad bad. Make sure the variable was set to something
before cd-ing to blank and ending up in their $HOME.

Also, since each line under a make rule is treated as a new subshell,
it's not necessary to surround the whole line in ()s.


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

diff --git a/Makefile.in b/Makefile.in
index bc3aa44601d..298d329b4a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,25 +110,25 @@ install-htdocs:
 	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
 	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
 
 install-error:
 	@echo Installing error documents
 	@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
-	@(cd $(top_srcdir)/docs/error && cp -rp * $(errordir))
-	@(cd $(errordir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+	@cd $(top_srcdir)/docs/error && cp -rp * $(errordir)
+	@test "x$(errordir)" != "x" && cd $(errordir) && find . -name "CVS" -print | xargs rm -rf {} \;
 
 install-icons:
 	@echo Installing icons
 	@test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
-	@(cd $(top_srcdir)/docs/icons && cp -rp * $(iconsdir))
-	@(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+	@cd $(top_srcdir)/docs/icons && cp -rp * $(iconsdir)
+	@test "x$(iconsdir)" != "x" && cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
 
 install-cgi:
 	@echo Installing CGIs
 	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
-	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
+	@test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
 
 install-other:
 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)