Fix --create-testdir --with-tests.

diff --git a/ChangeLog b/ChangeLog
index 18db36a94e5c2c892c20702564e79b22ffc44e63..bb56d008d6d4eb1412a9f6400fdc81d5ea953ffb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir): Set gl_source_base correctly in
+       the tests directory.
+       Reported by Ralf Wildenhues.
+
 2006-11-13  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_emit_initmacro_start): Also override AC_LIBSOURCES.

diff --git a/gnulib-tool b/gnulib-tool
index 68fa095ec1dbae8e1245ab66f489bf1b7ef65256..c5bf682516958a3cca35294706d6d5ae806879c1 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-11-13 19:07:29 $'
+cvsdatestamp='$Date: 2006-11-14 09:37:20 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -2383,7 +2383,6 @@ func_create_testdir ()
        echo "gl_libdeps="
        echo "gl_ltlibdeps="
      fi
-     echo "gl_source_base='$testsbase'"
      # Wrap the set of autoconf snippets into an autoconf macro that is then
      # invoked. This is needed because autoconf does not support AC_REQUIRE
      # at the top level:
@@ -2403,6 +2402,7 @@ func_create_testdir ()
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
      # those of the tests.
+     echo "gl_source_base='../$sourcebase'"
      for module in $modules; do
        func_verify_nontests_module
        if test -n "$module"; then
@@ -2410,6 +2410,7 @@ func_create_testdir ()
            | sed -e "$sed_replace_build_aux"
        fi
      done
+     echo "gl_source_base='.'"
      for module in $modules; do
        func_verify_tests_module
        if test -n "$module"; then