Fixed a problem with 'make install' on one of the tarballs (which

have the CVS dirs removed already) with ReliantUnix's rm:

Installing configuration files
Installing HTML documents
Usage: rm [-firR] file ...
make[1]: *** [install-htdocs] Error 2
make[1]: Leaving directory `/home1/apache20/httpd-2.0.37'
make: *** [install-recursive] Error 1

Submitted by:	Jean-frederic Clere <jfrederic.clere@fujitsu-siemens.com>

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

diff --git a/CHANGES b/CHANGES
index b0e8e47218470a38cfebccf43ca51378c742b85a..795884aedac5178cf393fe5ffef92932e4eafba4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.38
 
+  *) Fixed a problem with 'make install' on ReliantUnix.
+     [Jean-frederic Clere <jfrederic.clere@fujitsu-siemens.com>]
+
   *) Make the default_handler catch all requests that aren't served by
      another handler.  This also gets us to return a 404 if a directory
      is requested, there is no DirectoryIndex, and mod_autoindex isn't

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