Oops, tweak last commit so that it also works in the first gnulib-tool run.

diff --git a/ChangeLog b/ChangeLog
index 8098603e1b412380e6d13d3763716f663dec9c31..d49d1a87dfbad4b88776f4e3684345af07ac53fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): When computing the edits, consider not
+       only the Makefile.ams that exist but also those that will be generated.
+
 2008-09-25  Simon Josefsson  <simon@josefsson.org>
 
        * modules/sys_select-tests (Depends-on): Remove sys_select itself,

diff --git a/gnulib-tool b/gnulib-tool
index ffeaefb699a0cfa88214edaa2c65881358e938fa..40527683e82bebe6f0fa3730f2812788de0a719e 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2929,12 +2929,19 @@ func_import ()
   fi
   func_note_Makefile_am_edit "" ACLOCAL_AMFLAGS "-I ${m4base}"
   {
-    # Find the first parent directory of $m4base that contains a Makefile.am.
+    # Find the first parent directory of $m4base that contains or will contain
+    # a Makefile.am.
     sed_last='s,^.*/\([^/][^/]*\)//*$,\1/,
 s,//*$,/,'
     sed_butlast='s,[^/][^/]*//*$,,'
     dir1="${m4base}/"; dir2=""
-    while test -n "$dir1" && test ! -f "${destdir}/${dir1}Makefile.am"; do
+    while test -n "$dir1" \
+          && ! { test -f "${destdir}/${dir1}Makefile.am" \
+                 || test "${dir1}Makefile.am" = "$sourcebase/$makefile_am" \
+                 || test "./${dir1}Makefile.am" = "$sourcebase/$makefile_am" \
+                 || { test -n "$inctests" \
+                      && { test "${dir1}Makefile.am" = "$testsbase/$makefile_am" \
+                           || test "./${dir1}Makefile.am" = "$testsbase/$makefile_am"; }; }; }; do
       dir2=`echo "$dir1" | sed -e "$sed_last"`"$dir2"
       dir1=`echo "$dir1" | sed -e "$sed_butlast"`
     done