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.

diff --git a/ChangeLog b/ChangeLog
index ab69ce7b45787a9967b7324711d331dbc2de6600..fabf7b2f3abe595ef1c593be5ced7eeeab91b496 100644 (file)
--- 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 71d00243fed1c5fdfa9437501a7d5941e63ebcd7..245ec6cc8e6f036d0d4f208de8ea6f05ad471654 100644 (file)
--- 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 4b9d6adbf3979a332d76fb184cc48d4c42213284..972a3279a292f1b0fea6cc9e0a70733b253e7692 100644 (file)
--- 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 f0fba8d24624ed98fd6ed1f07e96e9c92e30ffa8..6eb18bc76d9a62411236c2254d3a06f0b876d171 100644 (file)
--- 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 a32d261b9e73d0364108ca700778b3543af3fc1f..e8a7245ab69764ef81cd05571a6b970ab8d39579 100644 (file)
--- 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 fe7dcfa4e996426a9e624e4fa545abfc18fe946f..4effdddff6abb8b37ebb08c94b2feb0829b6c852 100644 (file)
--- 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 f258174625a052d1e9835434ed321d87f60c52e7..ec0b9eeb178865457ed00b2db16e2ce66566ae14 100644 (file)
--- 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 8c723d1c886a1d4082ec05d34a1f907f300682c3..3925938c70bb3300fc5d42964722e619f0e1d7ae 100644 (file)
--- 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}