(gnulib_modules): Don't create a file modlist.tmp, as

it is sometimes left behind as a garbage file (maybe due to the
multiple traps?).

diff --git a/bootstrap b/bootstrap
index bd0939a16e79d458e4e2da52d0a014881201be46..042336264cbd5ff48211a41b5fe14b12adb5e530 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -162,12 +162,16 @@ checkout() {
   fi
 }
 
-# Prepare temporary module list
-cat /dev/null > modlist.tmp
-trap 'rm -f modlist.tmp' 0 1 2 13 15
+gnulib_modules=
+newline='
+'
 
 get_modules() {
-       sed '/^[        ]*#/d;/^[       ]*$/d' $* >> modlist.tmp
+  new_gnulib_modules=`sed '/^[  ]*#/d; /^[      ]*$/d' $*`
+  case $gnulib_modules,$new_gnulib_modules in
+  ?*,?*) new_gnulib_modules=$newline$new_gnulib_modules;;
+  esac
+  gnulib_modules=$gnulib_modules$new_gnulib_modules
 }
 
 # Get paxutils files
@@ -223,7 +227,7 @@ esac
 
 get_modules gnulib.modules
 
-gnulib_modules=`sort -u modlist.tmp`
+gnulib_modules=`echo "$gnulib_modules" | sort -u`
 previous_gnulib_modules=
 while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   previous_gnulib_modules=$gnulib_modules