Mercurial > emacs

changeset 108578:438f784b2966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Glenn Morris <rgm@gnu.org>
date Fri, 14 May 2010 17:42:22 -0700
parents e81c7c754bb6
children ab7ad4459a75
files ChangeLog Makefile.in leim/ChangeLog leim/Makefile.in lisp/ChangeLog lisp/Makefile.in src/ChangeLog src/Makefile.in
diffstat 8 files changed, 24 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 14 18:46:11 2010 -0500
+++ b/ChangeLog	Fri May 14 17:42:22 2010 -0700
@@ -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.
--- a/Makefile.in	Fri May 14 18:46:11 2010 -0500
+++ b/Makefile.in	Fri May 14 17:42:22 2010 -0700
@@ -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
--- a/leim/ChangeLog	Fri May 14 18:46:11 2010 -0500
+++ b/leim/ChangeLog	Fri May 14 17:42:22 2010 -0700
@@ -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.
--- a/leim/Makefile.in	Fri May 14 18:46:11 2010 -0500
+++ b/leim/Makefile.in	Fri May 14 17:42:22 2010 -0700
@@ -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}/*/\#* ; \
--- a/lisp/ChangeLog	Fri May 14 18:46:11 2010 -0500
+++ b/lisp/ChangeLog	Fri May 14 17:42:22 2010 -0700
@@ -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
--- a/lisp/Makefile.in	Fri May 14 18:46:11 2010 -0500
+++ b/lisp/Makefile.in	Fri May 14 17:42:22 2010 -0700
@@ -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
--- a/src/ChangeLog	Fri May 14 18:46:11 2010 -0500
+++ b/src/ChangeLog	Fri May 14 17:42:22 2010 -0700
@@ -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.
--- a/src/Makefile.in	Fri May 14 18:46:11 2010 -0500
+++ b/src/Makefile.in	Fri May 14 17:42:22 2010 -0700
@@ -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}