Remove references to CVS directories etc in Makefiles.

* Makefile.in (install-arch-indep): Remove references to RCS, CVS,
and other files that no longer exist.

* leim/Makefile.in (install): Remove references to CVS-related files.

* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
Remove references to CVS, RCS and Old directories.

* src/Makefile.in (${ns_appdir}): Remove references to CVS-related files.

8 files changed, 24 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index ab69ce7b457..fabf7b2f3ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-arch-indep): Remove references to RCS, CVS,
+        and other files that no longer exist.
+
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (cpp_undefs): Add mktime, register, X11.
diff --git a/Makefile.in b/Makefile.in
index 71d00243fed..245ec6cc8e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -476,11 +476,8 @@ install-arch-indep: mkdir info install-etc
                 | (cd $${dest}; umask 022; \
                    tar -xvf - && cat > /dev/null) || exit 1; \
               find $${dest} -exec chown $${installuser} {} ';' ;\
-              for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
+              for subdir in `find $${dest} -type d -print` ; do \
                 chmod a+rx $${subdir} ; \
-                rm -rf $${subdir}/RCS ; \
-                rm -rf $${subdir}/CVS ; \
-                rm -f  $${subdir}/.cvsignore ; \
                 rm -f  $${subdir}/.gitignore ; \
                 rm -f  $${subdir}/.arch-inventory ; \
                 rm -f  $${subdir}/.DS_Store ; \
@@ -492,7 +489,6 @@ install-arch-indep: mkdir info install-etc
                  rm -f $${subdir}/[mM]akefile*.c $${subdir}/[mM]akefile*[.-]in \
                    $${subdir}/[mM]akefile ; \
                 rm -f  $${subdir}/ChangeLog* ; \
-                rm -f  $${subdir}/dired.todo ; \
               done) ; \
         done
         -rm -f $(DESTDIR)${lispdir}/subdirs.el
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 4b9d6adbf39..972a3279a29 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install): Remove references to CVS-related files.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.2 released.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index f0fba8d2462..6eb18bc76d9 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -237,8 +237,6 @@ install: all
             tar -chf - quail/* ja-dic \
                 | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
           fi; \
-          rm -rf ${INSTALLDIR}/CVS        ${INSTALLDIR}/*/CVS; \
-          rm -f  ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \
           rm -f  ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \
           rm -f  ${INSTALLDIR}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \
           rm -f  ${INSTALLDIR}/\#*        ${INSTALLDIR}/*/\#* ; \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a32d261b9e7..e8a7245ab69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+        Remove references to CVS, RCS and Old directories.
+
 2010-05-14  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc-bin.el (math-format-twos-complement): Group digits when
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index fe7dcfa4e99..4effdddff6a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -84,28 +84,25 @@ COMPILE_FIRST = \
 emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
-
 setwins=subdirs=`(find . -type d -print)`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \
+           case $$file in */.* | */.*/* | */=* ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
 
 # Find all subdirectories except `obsolete' and `term'.
-
 setwins_almost=subdirs=`(find . -type d -print)`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \
+           case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
 
 # Find all subdirectories in which we might want to create subdirs.el
-
 setwins_for_subdirs=subdirs=`(find . -type d -print)`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */cedet* ) ;; \
+           case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
diff --git a/src/ChangeLog b/src/ChangeLog
index f258174625a..ec0b9eeb178 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (${ns_appdir}): Remove references to CVS-related files.
+
 2010-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (specbind): Remove left-over duplicate test.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8c723d1c886..3925938c70b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -973,10 +973,8 @@ ${ns_appdir}: ${ns_appsrc}
         rm -fr ${ns_appdir}
         mkdir -p ${ns_appdir}
         ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - )
-        ( cd ${ns_appdir} ; for subdir in `find . -type d ! -name CVS -print` ; do \
-                chmod a+rx $${subdir} ; \
-                rm -rf $${subdir}/CVS ; \
-                rm -f  $${subdir}/.cvsignore ; done ; )
+        ( cd ${ns_appdir} ; for subdir in `find . -type d -print` ; do \
+                chmod a+rx $${subdir} ; done ; )
 
 ${ns_appbindir}Emacs: emacs${EXEEXT}
         mkdir -p ${ns_appbindir}