* automake.in (handle_tests): Avoid error messages from dejagnu

	test rules.  From Karl Heuer.

diff --git a/ChangeLog b/ChangeLog
index 30efe3abbaf29873ddc155e303ed99ea702c3434..0d67ead9e693b72ae05e533fbf3f7ee9a77e18d2 100644 (file)
--- 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 492958ec5096b65237d0914a6b039f0910a05512..e27c399324a5a4a59c21083915dc6e9c67c358f9 100755 (executable)
--- 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");
        }
     }