X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ac564be451362c738a89ff742b84408cfd2e704b..1c7b7e1d87f698efb2e3daad0f6484829563d96f:/bootstrap

diff --git a/bootstrap b/bootstrap
index 238873e3..c3ddd267 100755
--- a/bootstrap
+++ b/bootstrap
@@ -87,6 +87,7 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 
 # 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
 }