Re: 54-mying-changes.patch

[Akim Demaille]

Tom Tromey <address@hidden> writes:

> >>>>> "Akim" == Akim Demaille <address@hidden> writes:
> 
> Akim>         * automake.in: Mying changes.
> Akim>         (&handle_tags): Fix a bug uncovered by the previous mying 
> changes:
> Akim>         transform CONFIG into $config, not $xform.
> 
> I think this has a bug.
> It is ok if you fix it though.

oops, I missed that part.  What do you mean?

@@ -2576,7 +2577,7 @@ sub handle_tags
                $config .= basename ($one_hdr);
            }
        }
-       my $xform = &transform ('CONFIG' => $xform,
+       my $xform = &transform ('CONFIG' => $config,
                                'DIRS'   => join (' ', @tag_deps));
        $xform .= &transform_cond ('SUBDIRS' => &variable_defined ('SUBDIRS'));
 

to be applied on

    if (&saw_sources_p (1)
        || &variable_defined ('ETAGS_ARGS')
        || @tag_deps)
    {
        local ($config) = '';
        foreach my $one_hdr (@config_headers)
        {
            if ($relative_dir eq dirname ($one_hdr))
            {
                # The config header is in this directory.  So require it.
                $config .= ' ' if $config;
                $config .= basename ($one_hdr);
            }
        }
        my $xform = &transform ('CONFIG' => $xform,
                                'DIRS'   => join (' ', @tag_deps));
        $xform .= &transform_cond ('SUBDIRS' => &variable_defined ('SUBDIRS'));

        $output_rules .= &file_contents ('tags', $xform);
        $output_rules .= &file_contents ('tags-clean');
        &examine_variable ('TAGS_DEPENDENCIES');
    }