From: Tom Tromey <tromey@redhat.com>
Date: Thu, 14 Jan 1999 20:32:54 +0000 (+0000)
Subject: 	* automake.in (handle_tests): Avoid error messages from dejagnu
X-Git-Tag: Release-1-4~6
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3a3fc996d0877807e146ec4d8490bb2b9f5beb65;p=automake.git

	* automake.in (handle_tests): Avoid error messages from dejagnu
	test rules.  From Karl Heuer.
---

diff --git a/ChangeLog b/ChangeLog
index 30efe3ab..0d67ead9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-14  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (handle_tests): Avoid error messages from dejagnu
+	test rules.  From Karl Heuer.
+
 	* automake.in (handle_texinfo): Add `/' to end of $conf_dir.
 
 	* Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.
diff --git a/automake.in b/automake.in
index 492958ec..e27c3993 100755
--- a/automake.in
+++ b/automake.in
@@ -3694,7 +3694,7 @@ sub handle_tests
 	    # useful text on this topic.
 	    $output_rules .= ("site.exp: Makefile\n"
 			      . "\t\@echo 'Making a new site.exp file...'\n"
-			      . "\t-\@rm -f site.bak\n"
+			      . "\t\@test ! -f site.bak || rm -f site.bak\n"
 			      . "\t\@echo '## these variables are automatically generated by make ##' > \$\@-t\n"
 			      . "\t\@echo '# Do not edit here.  If you wish to override these values' >> \$\@-t\n"
 			      . "\t\@echo '# edit the last section' >> \$\@-t\n"
@@ -3725,8 +3725,8 @@ sub handle_tests
 	    }
 
 	    $output_rules .= ("\t\@echo '## All variables above are generated by configure. Do Not Edit ##' >> \$\@-t\n"
-			      . "\t-\@sed '1,/^## All variables above are.*##/ d' site.exp >> \$\@-t\n"
-			      . "\t-\@mv site.exp site.bak\n"
+			      . "\t\@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> \$\@-t\n"
+			      . "\t\@test ! -f site.exp || mv site.exp site.bak\n"
 			      . "\t\@mv \$\@-t site.exp\n");
 	}
     }