Correct last change.

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 1f7f187..8c12e06 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-03-17 16:27:48 $'
+cvsdatestamp='$Date: 2007-04-12 13:02:00 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -826,6 +826,7 @@ func_all_modules ()
             -e '/^COPYING$/d' -e '/\/COPYING$/d' \
             -e '/^README$/d' -e '/\/README$/d' \
             -e '/^TEMPLATE$/d' \
+            -e '/^TEMPLATE-EXTENDED$/d' \
             -e '/^TEMPLATE-TESTS$/d' \
             -e '/^\..*/d' \
             -e '/~$/d' \
@@ -848,6 +849,7 @@ func_verify_module ()
      && test "COPYING" != "$module" \
      && test "README" != "$module" \
      && test "TEMPLATE" != "$module" \
+     && test "TEMPLATE-EXTENDED" != "$module" \
      && test "TEMPLATE-TESTS" != "$module"; then
     # OK, $module is a correct module name.
     # Verify that building the module description with 'patch' succeeds.
@@ -1173,7 +1175,9 @@ ba
   done
   # Add the dummy module, to make sure the library will be non-empty.
   if test -z "$have_lib_SOURCES"; then
-    func_append modules " dummy"
+    if func_acceptable "dummy"; then
+      func_append modules " dummy"
+    fi
   fi
 }
 
@@ -2823,13 +2827,13 @@ func_create_testdir ()
   # distributed (such as getdate.c).
   # 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' -e 's,^MOSTLYCLEANFILES[         ]*+=\([^#]*\).*$,\1,p'`
+                 | 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'
   built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
-                 | sed -n -e 's,^BUILT_SOURCES[        ]*+=\([^#]*\).*$,\1,p' \
+                 | sed -n -e 's,^BUILT_SOURCES[         ]*+=\([^#]*\).*$,\1,p' \
                  | sed -e "$sed_remove_make_variables"`
   distributed_built_sources=`for file in $built_sources; do
                                case "$cleaned_files" in
@@ -2907,8 +2911,8 @@ func_create_megatestdir ()
    echo "   echo rc=\$?"
    echo "  ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule"
    echo "done"
-  ) > "$megatestdir/autobuild"
-  chmod a+x "$megatestdir/autobuild"
+  ) > "$megatestdir/do-autobuild"
+  chmod a+x "$megatestdir/do-autobuild"
 
   # Create Makefile.am.
   (echo "## Process this file with automake to produce Makefile.in."
@@ -2917,7 +2921,7 @@ func_create_megatestdir ()
    echo
    echo "SUBDIRS = $megasubdirs"
    echo
-   echo "EXTRA_DIST = autobuild"
+   echo "EXTRA_DIST = do-autobuild"
   ) > "$megatestdir/Makefile.am"
 
   # Create configure.ac.