From 215e90e2f77e28b96ecfb915aab7c0096e8da148 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 4 Dec 2002 19:21:16 +0000 Subject: [PATCH] * automake.in (variable_pretty_output): Strip trailing backslashes in $val after $val is defined... Reported by Kevin Ryde. --- ChangeLog | 4 ++++ automake.in | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3109e415..0bf30975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-12-04 Alexandre Duret-Lutz + * automake.in (variable_pretty_output): Strip trailing + backslashes in $val after $val is defined... + Reported by Kevin Ryde. + * tests/depcomp2.test: Pass CC='gcc' as an argument to ./configure not in the environment. Otherwise the test will fail when run with ksh and VERBOSE=x. diff --git a/automake.in b/automake.in index b50868a7..106f6148 100755 --- a/automake.in +++ b/automake.in @@ -7129,13 +7129,13 @@ sub variable_pretty_output ($@) $output_vars .= $var_comment{$var}{$cond}; } + my $val = $var_value{$var}{$cond}; + my $equals = $var_type{$var}{$cond} eq ':' ? ':=' : '='; + my $make_condition = $cond->subst_string; # Suppress escaped new lines. &pretty_print_internal will # add them back, maybe at other places. $val =~ s/\\$//mg; - my $val = $var_value{$var}{$cond}; - my $equals = $var_type{$var}{$cond} eq ':' ? ':=' : '='; - my $make_condition = $cond->subst_string; $output_vars .= pretty_print_internal ("$make_condition$var $equals", "$make_condition\t", split (' ' , $val)); -- 2.43.5