* 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.

3 files changed, 16 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 78fca5d3d..d93971530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* 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.
+
 	* aclocal.m4, config.hin, configure:
 	Remove from CVS, since ./bootstrap generates them automatically.
 	* .cvsignore: Add INSTALL, Makefile.in, aclocal.m4, config.hin,
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.
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 6124e13da..bd83e9802 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -73,12 +73,9 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=wrapf:1:c-format\\\
 '
 
-# Clean up after getting gnulib and gettext files.
-bootstrap_conf_cleanup() {
-
-  # Gettext supplies these files, but we don't need them since
-  # we don't have an intl subdirectory.
-  files_to_remove='
+# Gettext supplies these files, but we don't need them since
+# we don't have an intl subdirectory.
+excluded_files='
     m4/glibc2.m4
     m4/intdiv0.m4
     m4/inttypes-h.m4
@@ -91,7 +88,4 @@ bootstrap_conf_cleanup() {
     m4/ulonglong.m4
     m4/visibility.m4
     m4/xsize.m4
-  '
-  echo $0: rm -f $files_to_remove &&
-  rm -f $files_to_remove
-}
+'