From: Tom Tromey <tromey@redhat.com>
Date: Sun, 27 Sep 1998 19:12:21 +0000 (+0000)
Subject: 	* automake.in (read_am_file): Treat backslash-newline as
X-Git-Tag: Release-1-3d~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af5433d73abe607f6ee7806199d2a558702aac54;p=thirdparty%2Fautomake.git

	* automake.in (read_am_file): Treat backslash-newline as
	whitespace.  Test parse.test.
---

diff --git a/ChangeLog b/ChangeLog
index 78b80a7a2..456f30ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 27 20:02:21 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (read_am_file): Treat backslash-newline as
+	whitespace.  Test parse.test.
+
 Sat Sep 26 19:31:22 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* configure: Rebuilt.
diff --git a/automake.in b/automake.in
index 714b4dc77..3f7e5c61e 100755
--- a/automake.in
+++ b/automake.in
@@ -5310,10 +5310,11 @@ sub read_am_file
 		$am_vars .= join ('', @conditional_stack) . $_;
 		$saw_bk = /\\$/;
 		# Chop newline and backslash if this line is
-		# continued.  FIXME: maybe ensure trailing whitespace
-		# exists?
+		# continued.  ensure trailing whitespace exists.
 		chop if $saw_bk;
 		chop if $saw_bk;
+		$contents{$last_var_name} .= ' '
+		    unless $contents{$last_var_name} =~ /\s$/;
 		$contents{$last_var_name} .= $_;
 		if (@conditional_stack)
 		{