From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 4 Dec 2002 19:21:16 +0000 (+0000)
Subject: * automake.in (variable_pretty_output): Strip trailing
X-Git-Tag: Release-1-7-2b~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b235be88428e33d54e397d3363b7be9b4b013f4;p=thirdparty%2Fautomake.git

* automake.in (variable_pretty_output): Strip trailing
backslashes in $val after $val is defined...
Reported by Kevin Ryde.
---

diff --git a/ChangeLog b/ChangeLog
index 3109e4151..0bf309752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-12-04  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* 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 b50868a7d..106f61481 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));