Fix func_exec_init.

	* tests/defs.m4sh (func_exec_init): Instead of using the undefined
	my_dir, call func_dirname_and_basename and use its result.
	(func_make): For consistency, don't use the useless local variable
	my_dir.

diff --git a/ChangeLog b/ChangeLog
index 2a54a646496ae03471fd6e7e818beaeba1a97161..df36a1676c0e0f67731f081acf3514629a3ee10c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-29  Akim Demaille  <demaille@gostai.com>
+
+       Fix func_exec_init.
+       * tests/defs.m4sh (func_exec_init): Instead of using the undefined
+       my_dir, call func_dirname_and_basename and use its result.
+       (func_make): For consistency, don't use the useless local variable
+       my_dir.
+
 2009-01-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Document --mode short-hands better, and test them.

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 27c6f77f2b02986086478e03b0a451fd8c3ffee8..58296da020ebdd92e94c7b4dc595307f25d829cd 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -2,7 +2,7 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 # defs -- Defines for Libtool testing environment.
 #
-#   Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software
+#   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software
 #   Foundation, Inc.
 #   Written by Gord Matzigkeit, 1996
 #   Rewritten by Gary V. Vaughan, 2003
@@ -102,7 +102,7 @@ func_get_config ()
     my_build_regex=false
   fi
   my_first=:
-  
+
   for my_varname in $my_varname_list; do
     if $my_build_regex; then
       $my_first || my_regex="$my_regex|"
@@ -247,9 +247,7 @@ func_make ()
     $opt_debug
     my_args=${1+"$@"}
     func_dirname_and_basename "`pwd`"
-    my_dir=$func_basename_result
-
-    func_msg "Running \`$MAKE $my_args' in $my_dir"
+    func_msg "Running \`$MAKE $my_args' in $func_basename_result"
 
     eval $MAKE $my_args || exit $EXIT_FAIL
 }
@@ -288,7 +286,8 @@ func_make_uninstall ()
 func_exec_init ()
 {
     $opt_debug
-    func_msg "Executing $1 programs in $my_dir"
+    func_dirname_and_basename "`pwd`"
+    func_msg "Executing $1 programs in $func_basename_result"
 
     # Windows hosts search for dlls in the command path
     PATH=$prefix/lib:$PATH
@@ -359,4 +358,3 @@ func_msg "Running $progname"
 # sh-indentation:2
 # End:
 ]])
-