From d891725733e56a39559dc89877d1382a6a483af6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 14 Jan 1999 20:32:55 +0000 Subject: [PATCH] * automake.in (handle_tests): Avoid error messages from dejagnu test rules. From Karl Heuer. --- ChangeLog | 3 +++ automake.in | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30efe3a..0d67ead 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-01-14 Tom Tromey + * 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 492958e..e27c399 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"); } } -- 2.7.4