* bootstrap (bootstrap_conf_cleanup): Remove.

(excluded_files): New var.
* bootstrap.conf: Likewise.
* bootstrap (slurp): Exclude files early if they're in the
excluded_files list.  That way, their names don't get put into
.cvsignore.

1 files changed, 5 insertions, 4 deletions

diff --git a/bootstrap b/bootstrap
index e758b8c2b..c9d50d220 100755
--- a/bootstrap
+++ b/bootstrap
@@ -83,8 +83,8 @@ XGETTEXT_OPTIONS='\\\
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
-# Clean up after getting gnulib and gettext files.
-bootstrap_conf_cleanup() { :; }
+# Files we don't want to import.
+excluded_files=
 
 # Override the default configuration, if necessary.
 test -r bootstrap.conf && . ./bootstrap.conf
@@ -214,6 +214,9 @@ slurp() {
     sep=
     for file in `ls $1/$dir`; do
       test -d $1/$dir/$file && continue
+      for excluded_file in $excluded_files; do
+	test "$dir/$file" = "$excluded_file" && continue 2
+      done
       if test $file = Makefile.am; then
 	copied=$copied${sep}gnulib.mk; sep=$nl
 	echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
@@ -282,8 +285,6 @@ slurp $bt2 $bt || exit
 
 rm -fr $bt $bt2 || exit
 
-bootstrap_conf_cleanup || exit
-
 
 # Reconfigure, getting other files.