[Emacs-diffs] /srv/bzr/emacs/trunk r100287: Remove references to CVS directories etc in Makefiles.

[Glenn Morris]

------------------------------------------------------------
revno: 100287
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-14 17:42:22 -0700
message:
  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.
modified:
  ChangeLog
  Makefile.in
  leim/ChangeLog
  leim/Makefile.in
  lisp/ChangeLog
  lisp/Makefile.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-14 03:36:40 +0000
+++ b/ChangeLog 2010-05-15 00:42:22 +0000
@@ -1,3 +1,8 @@
+2010-05-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-arch-indep): Remove references to RCS, CVS,
+       and other files that no longer exist.
+
 2010-05-14  Glenn Morris  <address@hidden>
 
        * configure.in (cpp_undefs): Add mktime, register, X11.

=== modified file 'Makefile.in'
--- a/Makefile.in       2010-05-06 07:24:18 +0000
+++ b/Makefile.in       2010-05-15 00:42:22 +0000
@@ -476,11 +476,8 @@
                | (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 @@
                 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

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2010-05-08 18:47:07 +0000
+++ b/leim/ChangeLog    2010-05-15 00:42:22 +0000
@@ -1,3 +1,7 @@
+2010-05-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install): Remove references to CVS-related files.
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2010-03-18 06:37:26 +0000
+++ b/leim/Makefile.in  2010-05-15 00:42:22 +0000
@@ -237,8 +237,6 @@
            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}/*/\#* ; \

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-14 23:46:11 +0000
+++ b/lisp/ChangeLog    2010-05-15 00:42:22 +0000
@@ -1,3 +1,8 @@
+2010-05-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+       Remove references to CVS, RCS and Old directories.
+
 2010-05-14  Jay Belanger  <address@hidden>
 
        * calc-bin.el (math-format-twos-complement): Group digits when

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2010-04-24 02:36:43 +0000
+++ b/lisp/Makefile.in  2010-05-15 00:42:22 +0000
@@ -84,28 +84,25 @@
 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-14 17:53:42 +0000
+++ b/src/ChangeLog     2010-05-15 00:42:22 +0000
@@ -1,3 +1,7 @@
+2010-05-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (${ns_appdir}): Remove references to CVS-related files.
+
 2010-05-14  Stefan Monnier  <address@hidden>
 
        * eval.c (specbind): Remove left-over duplicate test.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-14 04:23:23 +0000
+++ b/src/Makefile.in   2010-05-15 00:42:22 +0000
@@ -973,10 +973,8 @@
        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}