From 4bd6db9df127f74a0fd957ddbda4743a9c22e053 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Tue, 13 Dec 2005 14:44:17 +0000
Subject: Update the make.1 man page. Use rm -f instead of rm in the test
 scripts.  Fixes bug #15085.

---
 tests/scripts/targets/FORCE  | 11 ++---------
 tests/scripts/targets/PHONY  | 11 ++---------
 tests/scripts/targets/SILENT | 11 ++---------
 3 files changed, 6 insertions(+), 27 deletions(-)

(limited to 'tests/scripts/targets')

diff --git a/tests/scripts/targets/FORCE b/tests/scripts/targets/FORCE
index befb326..eb8f251 100644
--- a/tests/scripts/targets/FORCE
+++ b/tests/scripts/targets/FORCE
@@ -1,16 +1,9 @@
+#                                                                    -*-perl-*-
+
 $description = "The following tests rules without Commands or Dependencies.";
 
 $details = "If the rule ...\n";
 
-if ($vos)
-{
-   $delete_command = "delete_file";
-}
-else
-{
-   $delete_command = "rm";
-}
-
 open(MAKEFILE,"> $makefile");
 
 # The Contents of the MAKEFILE ...
diff --git a/tests/scripts/targets/PHONY b/tests/scripts/targets/PHONY
index dd46b3f..c8e2110 100644
--- a/tests/scripts/targets/PHONY
+++ b/tests/scripts/targets/PHONY
@@ -1,3 +1,5 @@
+#                                                                    -*-perl-*-
+
 $description = "The following tests the use of a PHONY target.  It makes\n"
               ."sure that the rules under a target get executed even if\n"
               ."a filename of the same name of the target exists in the\n"
@@ -8,15 +10,6 @@ $details = "This makefile in this test declares the target clean to be a \n"
           ."directory.  Although this file exists, the rule under the target\n"
           ."clean should still execute because of it's phony status.";
 
-if ($vos)
-{
-   $delete_command = "delete_file";
-}
-else
-{
-   $delete_command = "rm";
-}
-
 $example = "EXAMPLE_FILE";
 
 open(MAKEFILE,"> $makefile");
diff --git a/tests/scripts/targets/SILENT b/tests/scripts/targets/SILENT
index 5f9a1db..4bb0a0f 100644
--- a/tests/scripts/targets/SILENT
+++ b/tests/scripts/targets/SILENT
@@ -1,3 +1,5 @@
+#                                                                    -*-perl-*-
+
 $description = "The following tests the special target .SILENT.  By simply\n"
               ."mentioning this as a target, it tells make not to print\n"
               ."commands before executing them.";
@@ -5,15 +7,6 @@ $description = "The following tests the special target .SILENT.  By simply\n"
 $details = "This test is the same as the clean test except that it should\n"
           ."not echo its command before deleting the specified file.\n";
 
-if ($vos)
-{
-   $delete_command = "delete_file";
-}
-else
-{
-   $delete_command = "rm";
-}
-
 $example = "EXAMPLE_FILE";
 
 open(MAKEFILE,"> $makefile");
-- 
cgit v1.2.3