From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 Mar 2007 15:20:28 +0000 (+0000)
Subject: Avoiding the "./configure && make && make distclean" did not work most of the
X-Git-Tag: cvs-readonly~808
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=67323e00d04e4790947f0f0b0ac8c244769008a2;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index 4a9e7919d..9eef4acf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 
 2007-03-10  Bruno Haible  <bruno@clisp.org>
diff --git a/gnulib-tool b/gnulib-tool
index eadd98dc9..6f7d67202 100755
--- 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'