Undo last gnulib-tool commit: maintainer-makefile is fixed.

diff --git a/ChangeLog b/ChangeLog
index 5369ce37b1786c88fddc4f33bd5df1631775955d..75ae3a67a933b72b53f8d1b40e998127c0ef4fb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,12 +14,6 @@
        defined as macros. Needed on QNX 6.4.1.
        Reported by Matt Kraai <mkraai@beckman.com>.
 
-2009-07-25  Bruno Haible  <bruno@clisp.org>
-
-       * gnulib-tool (func_create_testdir, func_create_megatestdir): Exclude
-       the maintainer-makefile module.
-       Reported by Matt Kraai <mkraai@beckman.com>.
-
 2009-07-23  Jim Meyering  <meyering@redhat.com>
 
        maint.mk: invoke "make dist" with a working value of XZ_OPT

diff --git a/gnulib-tool b/gnulib-tool
index 038b02ca982aed770b5438861317e12d3f520121..ea451ec4c41d0cb575c231c5b7a3ec9e54e5f6f3 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3818,10 +3818,9 @@ func_create_testdir ()
   if test -z "$modules"; then
     # All modules together.
     # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
-    # Except maintainer-makefile, which requires a cfg.mk file.
     # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME.
     modules=`func_all_modules`
-    modules=`for m in $modules; do case $m in config-h | maintainer-makefile | ftruncate | mountlist) ;; *) echo $m;; esac; done`
+    modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist) ;; *) echo $m;; esac; done`
   fi
   modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u`
 
@@ -4312,8 +4311,7 @@ func_create_megatestdir ()
   done
   # Then, all modules all together.
   # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
-  # Except maintainer-makefile, which requires a cfg.mk file.
-  allmodules=`for m in $allmodules; do if test $m != config-h && test $m != maintainer-makefile; then echo $m; fi; done`
+  allmodules=`for m in $allmodules; do if test $m != config-h; then echo $m; fi; done`
   func_create_testdir "$megatestdir/ALL" "$allmodules"
   func_append megasubdirs "ALL"