Minor bug fixes

1 files changed, 6 insertions, 4 deletions

diff --git a/automake.in b/automake.in
index b06fabbea..cc827812f 100755
--- a/automake.in
+++ b/automake.in
@@ -1738,7 +1738,7 @@ sub handle_tags
 	if ($config_header && $relative_dir eq &dirname ($config_header))
 	{
 	    # The config header is in this directory.  So require it.
-	    ($xform = &basename ($config_header)) =~ s/(\W)/\\\1/g;
+	    ($xform = &basename ($config_header)) =~ s/(\W)/\\$1/g;
 	}
 	$xform = ('s/\@CONFIG\@/' . $xform . '/;'
 		  . 's/\@DIRS\@/' . join (' ', @tag_deps) . '/');
@@ -2389,7 +2389,9 @@ sub handle_configure
 
 	if ($local =~ /^(.*):(.*)$/)
 	{
-	    # This is the ":" syntax of AC_OUTPUT.
+	    # This is the ":" syntax of AC_OUTPUT.  Note that the
+	    # first word on @inputs must be the name of the created
+	    # file.
 	    @inputs = split (':', $2);
 	    $local = $1;
 	}
@@ -2411,7 +2413,7 @@ sub handle_configure
 	push (@actual_other_files, $local);
 
 	&require_file_with_conf_line ($ac_output_line, $FOREIGN,
-				      $input);
+				      $inputs[0]);
     }
 
     # These files get removed by "make clean".
@@ -4201,7 +4203,7 @@ sub am_install_var
 			if (! $seen_libtool)
 			{
 			    &am_line_error ($one_name,
-					    "\`$rcurse' is a libtool library name, but AM_PROG_LIBTOOL is not in \`configure.in'");
+					    "\`$rcurs' is a libtool library name, but AM_PROG_LIBTOOL is not in \`configure.in'");
 			    $seen_libtool = 1;
 			}