Exclude the 'gnumakefile' module from default testdir builds.

diff --git a/ChangeLog b/ChangeLog
index 19792e6..4d70afb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-04  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir, func_create_megatestdir): Don't
+       include the 'gnumakefile' module by default.
+       Reported by Simon Josefsson.
+
 2008-06-03  Bruno Haible  <bruno@clisp.org>
 
        * lib/file-has-acl.c (file_has_acl): Put Solaris 10 code after POSIX-

diff --git a/gnulib-tool b/gnulib-tool
index a3b9df5..5cb90e9 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3418,8 +3418,9 @@ func_create_testdir ()
     # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
     # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
     # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME.
+    # Except gnumakefile, which breaks when there is no file '.tarball-version'.
     modules=`func_all_modules`
-    modules=`for m in $modules; do case $m in config-h | fnmatch-posix | ftruncate | mountlist) ;; *) echo $m;; esac; done`
+    modules=`for m in $modules; do case $m in config-h | fnmatch-posix | ftruncate | mountlist | gnumakefile) ;; *) echo $m;; esac; done`
   fi
   modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u`
 
@@ -3894,7 +3895,8 @@ func_create_megatestdir ()
   # Then, all modules all together.
   # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
   # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
-  allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done`
+  # Except gnumakefile, which breaks when there is no file '.tarball-version'.
+  allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix && test $m != gnumakefile; then echo $m; fi; done`
   func_create_testdir "$megatestdir/ALL" "$allmodules"
   func_append megasubdirs "ALL"