[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49-formying.patch
From: |
Akim Demaille |
Subject: |
49-formying.patch |
Date: |
Wed, 21 Feb 2001 18:23:53 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in: Formatting and mying changes.
Index: automake.in
--- automake.in Tue, 20 Feb 2001 20:28:16 +0100 akim (am/f/39_automake.i 1.57
755)
+++ automake.in Tue, 20 Feb 2001 20:44:05 +0100 akim (am/f/39_automake.i 1.57
755)
@@ -6108,6 +6108,7 @@ sub read_am_file
}
# Value here doesn't matter; for targets we only note
# existence.
+# FIXME: I don't understand the next line at all, it seems dead wrong --akim
$contents{$1} = 1;
$targets{$1} = 1;
my $cond_string = join ('', @conditional_stack);
@@ -6379,15 +6380,14 @@ sub read_main_am_file
}
# Generate copyright header for generated Makefile.in.
- local ($ov) = $output_vars;
+ my $ov = $output_vars;
$output_vars = ("# $in_file_name generated automatically by automake "
. $VERSION . " from $am_file_name\n");
$output_vars .= $gen_copyright;
# Now go through and delete all the variables that the user did
# not change.
- local ($var);
- foreach $var (keys %saved_contents)
+ foreach my $var (keys %saved_contents)
{
if ($contents{$var} eq $saved_contents{$var})
{
@@ -6400,7 +6400,6 @@ sub read_main_am_file
# end.
&define_standard_variables;
$output_vars .= $ov;
-
}
################################################################
@@ -7115,8 +7114,9 @@ sub am_install_var
# include EXEEXT when in Cygwin32 mode.
if ($seen_exeext && $primary eq 'PROGRAMS')
{
- local (@conds) = &variable_conditions ($one_name);
- local (@one_binlist);
+ my @conds = &variable_conditions ($one_name);
+
+ # FIXME: This code is mad, rewrite!
# FIXME: this definitely loses aesthetically; it
# redefines $ONE_NAME. Instead we should arrange for
@@ -7125,7 +7125,7 @@ sub am_install_var
if (! @conds)
{
- @one_binlist = ();
+ my @one_binlist = ();
foreach $rcurs (&variable_value_as_list ($one_name, ''))
{
if ($rcurs =~ /\./ || $rcurs =~ /address@hidden@$/)
@@ -7143,14 +7143,13 @@ sub am_install_var
}
else
{
- local ($cond);
local ($condvals) = '';
- foreach $cond (@conds)
+ foreach my $cond (@conds)
{
- @one_binlist = ();
- local (@condval) = &variable_value_as_list ($one_name,
- $cond);
- foreach $rcurs (@condval)
+ my @one_binlist = ();
+ my @condval = &variable_value_as_list ($one_name,
+ $cond);
+ foreach my $rcurs (@condval)
{
if ($rcurs =~ /\./ || $rcurs =~ /address@hidden@$/)
{
- 49-formying.patch,
Akim Demaille <=