From: Tom Tromey <tromey@redhat.com>
Date: Fri, 9 Feb 2001 02:30:27 +0000 (+0000)
Subject: 	* automake.in (file_contents): Only add $actions if any are
X-Git-Tag: v1.10.2~2246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c095a8d87371b444ebfcc849c9c51f06bd9809e;p=platform%2Fupstream%2Fautomake.git

	* automake.in (file_contents): Only add $actions if any are
	found.  Fixes new failure in pr87.test.
---

diff --git a/ChangeLog b/ChangeLog
index bba04c0..9f67dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-08  Tom Tromey  <tromey@redhat.com>
+
+	* automake.in (file_contents): Only add $actions if any are
+	found.  Fixes new failure in pr87.test.
+
 2001-02-08  Pavel Roskin  <proski@gnu.org>
 
 	* tests/pr87.test: Check foo/Makfile.in after it is created.
diff --git a/automake.in b/automake.in
index eafaa12..06e2a08 100755
--- a/automake.in
+++ b/automake.in
@@ -7097,7 +7097,12 @@ sub file_contents
 		      $result_rules .= "$targets:";
 		      $result_rules .= " $dependencies"
 			if $dependencies;
-		      $result_rules .= "\n$actions\n";
+		      $result_rules .= "\n";
+		      # Only add actions if we found some.  Otherwise
+		      # we can end up with a spurious newline.  See
+		      # pr87.test.
+		      $result_rules .= "$actions\n"
+			  if $actions;
 		    }
 		  $comment = $separator = '';
 		  last;