From d19afd563b98d081716c41f0bcd81fc5c46c214f Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 4 Dec 2001 21:58:48 +0000 Subject: [PATCH] * automake.in (macro_define): Fix misuse of chomp introduced on 2001-11-28. --- ChangeLog | 5 +++++ automake.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7632a2b..4d85c720 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-04 Alexandre Duret-Lutz + + * automake.in (macro_define): Fix misuse of chomp introduced on + 2001-11-28. + 2001-11-28 Alexandre Duret-Lutz * automake.in (append_comments): New. Extracted from diff --git a/automake.in b/automake.in index d7650898..2f6092ed 100755 --- 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}) { -- 2.43.5