Avoiding the "./configure && make && make distclean" did not work most of the

time.

diff --git a/ChangeLog b/ChangeLog
index 4a9e7919d4b4f2fa535e604734a78d976796c163..9eef4acf325d2cbd9a3c161ba993fe580e98fd03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-10  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir): Treat MOSTLYCLEANFILES like
+       CLEANFILES. Put spaces in each line of $cleaned_files, not only the
+       first and the last.
+
 2007-03-10  Bruno Haible  <bruno@clisp.org>
 
        * lib/stdint_.h (uint_least64_t): Fix typo in last patch.

diff --git a/gnulib-tool b/gnulib-tool
index eadd98dc90a3185f1566dd9715c11fc15e4bd32a..6f7d6720294d2480b3831fb7d2608a7df98a3e52 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-03-06 03:38:30 $'
+cvsdatestamp='$Date: 2007-03-10 15:20:28 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -2739,10 +2739,10 @@ func_create_testdir ()
   fi
   # Need to run configure and make once, to create built files that are to be
   # distributed (such as getdate.c).
-  # Extract the value of "CLEANFILES += ...".
+  # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...".
   cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
-                 | sed -n -e 's,^CLEANFILES[   ]*+=\([^#]*\).*$,\1,p'`
-  cleaned_files=" "`for file in $cleaned_files; do echo "$file"; done`" "
+                 | sed -n -e 's,^CLEANFILES[   ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[         ]*+=\([^#]*\).*$,\1,p'`
+  cleaned_files=`for file in $cleaned_files; do echo " $file "; done`
   # Extract the value of "BUILT_SOURCES += ...". Remove variable references
   # such $(FOO_H) because they don't refer to distributed files.
   sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g'