From 16ea152019ae71867e64b785fc17dfcd0e580159 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 5 Mar 2001 13:25:21 +0000 Subject: [PATCH] * automake.in ($am_file): Use vars. ($am_file_name, $in_file_name): Private to &generate_makefile. --- ChangeLog | 5 +++++ automake.in | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0463eef4..ac664228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-05 Akim Demaille + + * automake.in ($am_file): Use vars. + ($am_file_name, $in_file_name): Private to &generate_makefile. + 2001-03-05 Akim Demaille * automake.in: Preparation for `use strict': Move the diff --git a/automake.in b/automake.in index a70fdfae..fe62f71a 100755 --- a/automake.in +++ b/automake.in @@ -372,11 +372,6 @@ my %vars_scanned = (); 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; @@ -496,6 +491,7 @@ die "$me: no \`Makefile.am' found or specified\n" # 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) { @@ -641,8 +637,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 -- 2.43.5