backport Paul's CVS->.svn fix for Makefile.in

reviewed by: jerenkrantz, pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@106407 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 5664d9769b36b7851a1d76ea34484ddd520fe70e..5d6eae4c9f0270ad700d4a48cf2ea9aeaaad78d3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ install-htdocs:
            echo Installing HTML documents ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
            test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-           cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-error:
@@ -124,7 +124,7 @@ install-error:
            echo Installing error documents ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
            cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
-           test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-icons:
@@ -134,7 +134,7 @@ install-icons:
            echo Installing icons ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
            cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
-           test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-cgi:
@@ -144,7 +144,7 @@ install-cgi:
           echo Installing CGIs ; \
           $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
           cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
-          test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+          test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-other:
@@ -192,7 +192,7 @@ install-man:
        @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
        @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
        @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
-       @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+       @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
 
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \

diff --git a/STATUS b/STATUS
index d9668a457c4c364d9555a8114b2ed8305e3c8169..7e335ef02b5d46bf2c75eeb3ebceebe61174d788 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -75,10 +75,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    *) s/CVS/.svn/ in Makefile.in
-       http://svn.apache.org/viewcvs.cgi?rev=106266&view=rev
-       +1: trawick, jerenkrantz, pquerna
-
     *) mod_ssl: Fix an possible NULL pointer dereference in some configs.
        http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=13182
        PR: 31848