Avoid an automake error regarding the 'gettext' module.

diff --git a/ChangeLog b/ChangeLog
index aad421b..c62cb38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-07  Bruno Haible  <bruno@clisp.org>
 
+       * gnulib-tool (func_emit_tests_Makefile_am): Emit an empty SUBDIR
+       variable.
+       Needed to avoid an automake error regarding the 'gettext' module.
+
+2006-01-07  Bruno Haible  <bruno@clisp.org>
+
        * modules/gettext (configure.ac): Add an invocation of
        AM_GNU_GETTEXT_VERSION. Needed since autoreconf is used by gnulib-tool.
 

diff --git a/gnulib-tool b/gnulib-tool
index 9aaa1b1..bd54a2a 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-01-09 13:27:12 $'
+cvsdatestamp='$Date: 2006-01-10 13:37:12 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -748,6 +748,10 @@ func_emit_tests_Makefile_am ()
   echo
   echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
   echo
+  # Nothing is being added to SUBDIRS; nevertheless the existence of this
+  # variable is needed to avoid an error from automake:
+  #   "AM_GNU_GETTEXT used but SUBDIRS not defined"
+  echo "SUBDIRS ="
   echo "TESTS ="
   echo "TESTS_ENVIRONMENT ="
   echo "noinst_PROGRAMS ="