This is the mail archive of the
automake@gnu.org
mailing list for the automake project.
85-var-move.patch
- To: Automake <automake at gnu dot org>
- Subject: 85-var-move.patch
- From: Akim Demaille <akim at epita dot fr>
- Date: Wed, 28 Feb 2001 11:01:19 +0100
- List-Id: Discussion list for automake <automake.gnu.org>
Index: ChangeLog
from Akim Demaille <akim@epita.fr>
* automake.in ($am_file): Use vars.
($am_file_name, $in_file_name): Private to &generate_makefile.
Index: automake.in
--- automake.in Tue, 27 Feb 2001 22:52:56 +0100 akim (am/f/39_automake.i 1.92 755)
+++ automake.in Tue, 27 Feb 2001 22:58:21 +0100 akim (am/f/39_automake.i 1.92 755)
@@ -372,11 +372,6 @@
my $maint_charset = '';
my $dist_charset = 'utf8'; # recode doesn't support this yet.
-# Name of input file ("Makefile.in") and output file ("Makefile.am").
-# These have no directory components.
-my $am_file_name = '';
-my $in_file_name = '';
-
# TRUE if --cygnus seen.
my $cygnus_mode = 0;
@@ -490,6 +485,7 @@
# Now do all the work on each file.
# This guy must be local otherwise it's private to the loop.
+use vars '$am_file';
local $am_file;
foreach $am_file (@input_files)
{
@@ -635,8 +631,10 @@ sub generate_makefile
{
my ($output, $makefile) = @_;
- ($am_file_name = $makefile) =~ s/^.*\///;
- $in_file_name = $am_file_name . '.in';
+ # Name of input file ("Makefile.in") and output file
+ # ("Makefile.am"). These have no directory components.
+ (my $am_file_name = $makefile) =~ s/^.*\///;
+ my $in_file_name = $am_file_name . '.in';
$am_file_name .= '.am';
# $OUTPUT is encoded. If it contains a ":" then the first element