From 08fc48492acc07259d91293df12bf66447819443 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 10 Jul 2020 20:40:23 +0200
Subject: [PATCH] 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".
---
runtime/doc/Makefile | 2 +-
src/tee/Makefile | 2 +-
src/version.c | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 4112ae95e8..fcbcdc5bd6 100644
--- 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 7419913ccb..f6e91358fb 100644
--- 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 c13f7f18f9..7f71d14890 100644
--- 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,
/**/
--
GitLab