patch 8.2.1172: error messages when doing "make clean" in doc or tee

Problem:    Error messages when doing "make clean" in the runtime/doc or
            src/tee directories.
Solution:   Use "rm -f".

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 4112ae95e827dd5b0ee0c0612fd4a4cf7d517821..fcbcdc5bd6ecb9d6d054ded306023da8546e9ec6 100644 (file)
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -396,7 +396,7 @@ test_urls:
        vim -S test_urls.vim
 
 clean:
-       -rm doctags *.html tags.ref
+       -rm -f doctags *.html tags.ref
 
 # These files are in the extra archive, skip if not present
 

diff --git a/src/tee/Makefile b/src/tee/Makefile
index 7419913ccb977713eca9334bfe58002b515631a4..f6e91358fbf90d4aa9123f27d2532940c61160f3 100644 (file)
--- a/src/tee/Makefile
+++ b/src/tee/Makefile
@@ -4,7 +4,7 @@ CC=gcc
 CFLAGS=-O2 -fno-strength-reduce
 
 ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
 else
 DEL = del
 endif

diff --git a/src/version.c b/src/version.c
index c13f7f18f9b7f8b1be82b1ba239cc674c2704cd1..7f71d14890c4211cf27a33362d05ddb81c4400cd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1172,
 /**/
     1171,
 /**/