Re: am__append drops line continuation chars

[Alexandre Duret-Lutz]

>>> "Kevin" == Kevin Ryde <address@hidden> writes:

 Kevin> Alexandre Duret-Lutz <address@hidden> writes:
 >> 
 >> @@ -7337,6 +7332,11 @@
 >> my $val = $var_value{$var}{$cond};
 >> my $equals = $var_type{$var}{$cond} eq ':' ? ':=' : '=';
 >> my $make_condition = make_condition ($cond);
 >> +
 >> +      # Suppress escaped new lines.  &pretty_print_internal will
 >> +      # add them back, maybe at other places.
 >> +      $val =~ s/\\$//mg;

 Kevin> Looking at the cvs, this $val subst seems to have ended
 Kevin> up before the my $val, provoking

 Kevin> Global symbol "$val" requires explicit package name at 
/home/gg/mp/usr-new/bin/automake line 7134.

Thanks.  The above patch is against branch-1-7, and I recall I
got a conflict when I applied it on HEAD.  Seems like I went a
bit too fast to solve it.

I'm checking this in on HEAD.

2002-12-04  Alexandre Duret-Lutz  <address@hidden>

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

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1407
diff -u -r1.1407 automake.in
--- automake.in 3 Dec 2002 20:39:41 -0000       1.1407
+++ automake.in 4 Dec 2002 19:17:16 -0000
@@ -7129,13 +7129,13 @@
          $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));

-- 
Alexandre Duret-Lutz