maint: drop more CVS cruft

Commit 47c48ce was intended to remove all CVS support, but missed
some pieces.

* bootstrap (Version control): Don't generate .cvsignore or
prepopulate m4/.gitignore.
* .gitignore: Allow m4/gnulib-cache.m4 manually.
Reported by Stefano Lattarini.

Signed-off-by: Eric Blake <eblake@redhat.com>

3 files changed, 11 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index a336b02e..4cc8909a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ configure
 configure.lineno
 CVS
 /depcomp
+/doc/.gitignore
 /doc/fdl-1.3.texi
 /doc/gendocs_template
 /doc/gpl-3.0.texi
@@ -52,6 +53,8 @@ gnupload
 /lib/*
 !/lib/Makefile.am
 link-warning.h
+/m4/*
+!/m4/gnulib-cache.m4
 m4-*
 /maint.mk
 Makefile.in
diff --git a/ChangeLog b/ChangeLog
index f06d5f48..b1959618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-21  Eric Blake  <eblake@redhat.com>
+
+	maint: drop more CVS cruft
+	* bootstrap (Version control): Don't generate .cvsignore or
+	prepopulate m4/.gitignore.
+	* .gitignore: Allow m4/gnulib-cache.m4 manually.
+
 2012-09-06  Eric Blake  <eblake@redhat.com>
 
 	maint: enable gcc warnings during git development
diff --git a/bootstrap b/bootstrap
index b554a57a..c57cfd37 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2012-07-21
+# bootstrap (GNU M4) version 2012-09-21
 # Written by Gary V. Vaughan  <gary@gnu.org>
 
 # Copyright (C) 2004-2012 Free Software Foundation, Inc.
@@ -213,26 +213,6 @@ func_update ()
 ## Version control. ##
 ## ---------------- ##
 
-# gnulib-tool updates m4/.{git,cvs}ignore and lib/.{git,cvs}ignore, and
-# keeping generated files under version control does not make sense.
-# Since lib is entirely ignored, we only need to prepopulate the m4 ignore
-# files with generated files not tracked by gnulib-tool.
-if test -f $config_macro_dir/.gitignore ; then
-  :
-else
-  func_echo "creating initial $config_macro_dir/.cvsignore"
-  cat > $config_macro_dir/.cvsignore <<\EOF
-# files created by gnulib, but that gnulib doesn't track
-*~
-.cvsignore
-.gitignore
-gnulib-comp.m4
-# gnulib-tool edits below here
-EOF
-  func_echo "creating initial $config_macro_dir/.gitignore"
-  cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore
-fi
-
 # See if we can use gnulib's git-merge-changelog merge driver.
 if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
   if git config merge.merge-changelog.driver >/dev/null ; then