From: Akim Demaille <demaille@gostai.com>
Date: Mon, 5 Jan 2009 10:56:24 +0000 (+0100)
Subject: Fix func_exec_init.
X-Git-Tag: v2.2.7b~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13ef1b34b7a17af22769817f243c347b4412a890;p=thirdparty%2Flibtool.git

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 2a54a6464..df36a1676 100644
--- 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 27c6f77f2..58296da02 100644
--- 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:
 ]])
-