fix from ian

diff --git a/automake.in b/automake.in
index 4419aa11263ffd15ee9dc43c0425adedbd110853..adf30c88b5fc8ed107721e7a52e58bfe40eb1d80 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4965,7 +4965,6 @@ sub read_am_file
        }
        elsif (/$RULE_PATTERN/o)
        {
-           # warn "** Saw rule .$1.\n";
            # Found a rule.
            $was_rule = 1;
            if (defined $contents{$1}
@@ -4985,8 +4984,7 @@ sub read_am_file
            {
                if ($conditional{$1})
                {
-                   &check_ambiguous_conditional ($last_var_name,
-                                                 $cond_string);
+                   &check_ambiguous_conditional ($1, $cond_string);
                    $conditional{$1} .= ' ';
                }
                else
@@ -5422,22 +5420,18 @@ sub file_contents_with_transform
        }
        elsif (/$RULE_PATTERN/o)
        {
-           # warn "** Found rule .$1.\n";
            # Found a rule.
            $was_rule = 1;
            $skipping = defined $contents{$1};
-           # warn "** Skip $skipping\n" if $skipping;
            $result_rules .= $comment . $spacing . $_ if ! $skipping;
            $comment = $spacing = '';
            $saw_bk = /\\$/;
        }
        elsif (/$MACRO_PATTERN/o)
        {
-           # warn "** Found macro .$1.\n";
            # Found a variable reference.
            $was_rule = 0;
            $skipping = defined $contents{$1};
-           # warn "** Skip $skipping\n" if $skipping;
            $result_vars .= $comment . $spacing . $_ if ! $skipping;
            $comment = $spacing = '';
            $saw_bk = /\\$/;