You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jw...@apache.org on 2002/06/15 08:11:45 UTC
cvs commit: httpd-2.0 CHANGES Makefile.in
jwoolley 2002/06/14 23:11:45
Modified: . CHANGES Makefile.in
Log:
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 <jf...@fujitsu-siemens.com>
Revision Changes Path
1.833 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -d -u -r1.832 -r1.833
--- CHANGES 15 Jun 2002 05:49:05 -0000 1.832
+++ CHANGES 15 Jun 2002 06:11:44 -0000 1.833
@@ -1,5 +1,8 @@
Changes with Apache 2.0.38
+ *) Fixed a problem with 'make install' on ReliantUnix.
+ [Jean-frederic Clere <jf...@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
1.117 +4 -4 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -u -r1.116 -r1.117
--- Makefile.in 15 Jun 2002 04:41:51 -0000 1.116
+++ Makefile.in 15 Jun 2002 06:11:45 -0000 1.117
@@ -108,25 +108,25 @@
@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)