Make a sed program more robust.

diff --git a/ChangeLog b/ChangeLog
index 69a1ebab0cd6ef1edc0115644cec63bc877ff727..d3942cf6fe225292dc994a966559e9f3fdf29e57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Make change from 2008-06-23 more robust.
+       Reported by Paolo Bonzini <bonzini@gnu.org>.
+
 2008-07-30  Eric Blake  <ebb9@byu.net>
 
        test-strtod: allow compilation without -lm

diff --git a/gnulib-tool b/gnulib-tool
index 7dd2063a4e1af222b1432461d17997fc5d44aa84..022f8cf9f95361b7dc911ee707a9c295f4060016 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2197,6 +2197,7 @@ func_import ()
         s,^.*gl_LOCAL_DIR([[ ]*\([^])]*\).*$,cached_local_gnulib_dir="\1",p
       }
       /gl_MODULES(/ {
+        ta
         :a
           s/)/)/
           tb