diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-10 20:40:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-10 20:40:23 +0200 |
| commit | 08fc48492acc07259d91293df12bf66447819443 (patch) | |
| tree | c1c7ea33aeb3e2ce63759684df3ea17901b93ac6 | |
| parent | 58bb61cf5ee008254eb331bc3574eac87d2dcc4a (diff) | |
| download | vim-git-08fc48492acc07259d91293df12bf66447819443.tar.gz | |
patch 8.2.1172: error messages when doing "make clean" in doc or teev8.2.1172
Problem: Error messages when doing "make clean" in the runtime/doc or
src/tee directories.
Solution: Use "rm -f".
| -rw-r--r-- | runtime/doc/Makefile | 2 | ||||
| -rw-r--r-- | src/tee/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 4112ae95e..fcbcdc5bd 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 7419913cc..f6e91358f 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 c13f7f18f..7f71d1489 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1172, +/**/ 1171, /**/ 1170, |