* automake.in (macro_define): Fix misuse of chomp introduced on

2001-11-28.

diff --git a/ChangeLog b/ChangeLog
index c7632a2b904f98e1fcb08ee92e95ca7897ef979d..4d85c7201a748c9452f1339039c69adb4f1c6ced 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-04  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (macro_define): Fix misuse of chomp introduced on
+       2001-11-28.
+
 2001-11-28  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (append_comments): New.  Extracted from

diff --git a/automake.in b/automake.in
index d765089876223cbf027f4524d9adf86d3b46abce..2f6092edf04946048b0e3748f544a0900c39f32f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5738,10 +5738,10 @@ sub macro_define ($$$$$$)
   # Differentiate the first assignment (including with `+=').
   if ($type eq '+' && defined $var_value{$var}{$cond})
     {
-      if ($var_value{$var}{$cond} =~ /\n$/o)
+      if (chomp $var_value{$var}{$cond})
        {
          # Insert a backslash before a trailing newline.
-         $var_value{$var}{$cond} = chomp ($var_value{$var}{$cond}) . "\\\n";
+         $var_value{$var}{$cond} .= "\\\n";
        }
       elsif ($var_value{$var}{$cond})
        {