From 6bad23bcaf051b060c7b2cd4c9937c0907ec21d0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 3 Jan 1996 06:35:46 +0000 Subject: [PATCH] Fixed bug --- ChangeLog | 5 +++++ NEWS | 1 + automake.in | 15 ++++++--------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87e43895..1abcb69b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 2 23:33:24 1996 Tom Tromey + + * automake.in (read_am_file): Correctly deal with continued + variable definitions. + Mon Jan 1 15:43:25 1996 Tom Tromey * automake.in (handle_merge_targets): 'check' target depends on diff --git a/NEWS b/NEWS index 0737ed32..88ad10a6 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ New in 0.26: * Pretty-prints generated macros and rules * Comments in Makefile.am are placed more intelligently in Makefile.in * Generates .PHONY target +* Rule or macro in Makefile.am now overrides contents of Automake file New in 0.25: * Bug fixes. diff --git a/automake.in b/automake.in index 0ebcb1ba..069cc9d9 100755 --- a/automake.in +++ b/automake.in @@ -1182,16 +1182,13 @@ sub read_am_file else { $output_vars .= $_; - if (substr ($_, -1) eq "\\") - { - $contents{$last_var_name} .= substr ($_, 0, - length ($_) - 1); - } - else - { - $contents{$last_var_name} .= $_; - } $saw_bk = /\\$/; + # Chop newline and backslash if this line is + # continued. FIXME maybe ensure trailing whitespace + # exists? + chop if $saw_bk; + chop if $saw_bk; + $contents{$last_var_name} .= $_; } } elsif (/$RULE_PATTERN/o) -- 2.43.5