Update for recent .gitignore fix in Gnulib.

* bootstrap: Back out 2008-07-18 hack now that gnulib-tool creates
anchored .gitignore entries.

diff --git a/ChangeLog b/ChangeLog
index c45bfad8c3076ea2f1f4c54064fee37d236622be..a5df756ddb6e5c4deabacf1391f98912b39db0ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-02  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Update for recent .gitignore fix in Gnulib.
+       * bootstrap: Back out 2008-07-18 hack now that gnulib-tool creates
+       anchored .gitignore entries.
+
 2008-08-02  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Set gnu or gnits strictness.

diff --git a/bootstrap b/bootstrap
index c3c7748b9110f577187f80f2823c92ec3eaad000..f92d1ccd8ef55b5ffe8918b74b0d760a231d90ff 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -614,12 +614,6 @@ if test -f $mam_template; then
   done
 fi
 
-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-
 # Reconfigure, getting other files.
 
 for command in \