From 9e56598f0aaa00a5254b5575e7f179ce141100a3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 14 Nov 2006 09:37:20 +0000 Subject: [PATCH] Fix --create-testdir --with-tests. --- ChangeLog | 6 ++++++ gnulib-tool | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18db36a94e..bb56d008d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-13 Bruno Haible + + * gnulib-tool (func_create_testdir): Set gl_source_base correctly in + the tests directory. + Reported by Ralf Wildenhues. + 2006-11-13 Bruno Haible * gnulib-tool (func_emit_initmacro_start): Also override AC_LIBSOURCES. diff --git a/gnulib-tool b/gnulib-tool index 68fa095ec1..c5bf682516 100755 --- 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 -- 2.30.2