* 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 3109e41519f0698b842d9e0bf8a3cd6bab6290f2..0bf3097528995cac21fecbba915facfbe78eb6f9 100644 (file)
--- 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 b50868a7da50b2f901b5504eefc5c17e0f92672b..106f61481366f3eb8223d1c5caa72c2af9c1951d 100755 (executable)
--- 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));