From e7283944019eda9b40528019e490d0a596746fc3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 24 Sep 1996 15:30:54 +0000 Subject: [PATCH] dejagnu fix --- ChangeLog | 4 ++++ automake.in | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5992a2b1..d5401a1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 24 09:15:46 1996 Tom Tromey + + * automake.in (read_am_file): Cleaned up dejagnu variables. + Mon Sep 23 00:04:48 1996 Tom Tromey * automake.in (parse_arguments): New usage to conform to GNU diff --git a/automake.in b/automake.in index 25e1db82..faf5693f 100755 --- a/automake.in +++ b/automake.in @@ -3097,16 +3097,20 @@ sub read_am_file # Generate some useful variables when AC_CANONICAL_* used. if ($seen_canonical) { - local ($curs, @varlist); - push (@varlist, 'host_alias', 'host_triplet'); + local ($curs, %vars); + $vars{'host_alias'} = 'host_alias'; + $vars{'host_triplet'} = 'host'; if ($seen_canonical == $AC_CANONICAL_SYSTEM) { - push (@varlist, 'build_alias', 'target_alias'); + $vars{'build_alias'} = 'build_alias'; + $vars{'build_triplet'} = 'build'; + $vars{'target_alias'} = 'target_alias'; + $vars{'target_triplet'} = 'target'; } - foreach $curs (@varlist) + foreach $curs (keys %vars) { - $header_vars .= "$curs = \@$curs\@\n"; - $contents{$curs} = "\@$curs\@"; + $header_vars .= "$curs = \@$vars{$curs}\@\n"; + $contents{$curs} = "\@$vars{$curs}\@"; } } -- 2.43.5