[patch] automake-1.4-not-use-do.patch

automake-1.4-not-use-do.patch (text/plain), 1.38 KB, created by Dmitry on 2011-05-21 13:48:49 UTC

diff -urN automake-1.4-p6.orig/ChangeLog automake-1.4-p6/ChangeLog
--- automake-1.4-p6.orig/ChangeLog      2002-07-28 01:07:18.000000000 +0400
+++ automake-1.4-p6/ChangeLog   2011-05-21 17:23:56.660999980 +0400
@@ -322,6 +322,12 @@

        * configure.in (AM_INIT_AUTOMAKE):  Bump version to 1.4.1.

[phone]  Tom Tromey  <[e-mail]>
+
+       * automake.in (finish_languages): Use "&", not "do".  From Pavel
+       Roskin.
+       (handle_single_transform_list): Likewise.
+
 1999-01-14  Tom Tromey  <[e-mail]>

        * automake.in (handle_configure): Compute $header_dir based on

diff -urN automake-1.4-p6.orig/automake.in automake-1.4-p6/automake.in
--- automake-1.4-p6.orig/automake.in	2011-05-21 17:20:09.000000000 +0400
+++ automake-1.4-p6/automake.in	2011-05-21 17:25:50.623002432 +0400
@@ -983,7 +983,7 @@ sub finish_languages
 
 	# Compute the function name of the finisher and then call it.
 	$name = 'lang_' . $lang . '_finish';
-	do $name ();
+	& $name ();
     }
 
     # If the project is entirely C++ or entirely Fortran 77, don't
@@ -1144,7 +1144,7 @@ sub handle_single_transform_list
 		# Found the language, so see what it says.
 		local ($subr) = 'lang_' . $lang . '_rewrite';
 		# Note: computed subr call.
-		local ($r) = do $subr ($base, $extension);
+		local ($r) = & $subr ($base, $extension);
 		# Skip this entry if we were asked not to process it.
 		next if ! $r;