bootstrap now creates build-aux/announce-gen, .cvsignore

[Paul Eggert]

I installed this to keep Bison up-to-date with respect to coreutils:

2006-12-18  Paul Eggert  <address@hidden>

        * bootstrap: Sync from coreutils.
        (gnulib_extra_files): Add build-aux/announce.gen.
        (slurp): Adjust .gitignore files like .cvsignore files.
        * build-aux/announce-gen: Remove from CVS, since bootstrap
        now creates this.

--- bootstrap   8 Nov 2006 20:01:48 -0000       1.48
+++ bootstrap   18 Dec 2006 17:20:54 -0000
@@ -87,6 +87,7 @@ package=`sed -n "$extract_package_name" 
 
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files='
+       build-aux/announce-gen
        build-aux/install-sh
        build-aux/missing
        build-aux/mdate-sh
@@ -389,11 +390,13 @@ slurp() {
       fi || exit
     done
 
-    ig=$dir/.cvsignore
-    if test -n "$copied" && test -f $ig; then
-      echo "$copied" | sort -u - $ig | cmp -s - $ig ||
-      echo "$copied" | sort -u - $ig -o $ig || exit
-    fi
+    for dot_ig in .cvsignore .gitignore; do
+      ig=$dir/$dot_ig
+      if test -n "$copied" && test -f $ig; then
+       echo "$copied" | sort -u - $ig | cmp -s - $ig ||
+       echo "$copied" | sort -u - $ig -o $ig || exit
+      fi
+    done
   done
 }