From 8ed75cb0b4d06b8c13dfb12bf3c54be0f6f0c71b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 9 Jun 2019 14:39:13 +0200 Subject: [PATCH] patch 8.1.1505: running "make clean" twice gives errors Problem: Running "make clean" twice gives errors. Solution: Add "-f" to "rm". (closes #4516) --- src/testdir/Makefile | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/testdir/Makefile b/src/testdir/Makefile index bf64a0383..d3c1184e8 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -85,9 +85,9 @@ RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) clean: -rm -rf *.out *.failed *.res *.rej *.orig - -rm opt_test.vim test.log test_result.log messages - -rm $(RM_ON_RUN) $(RM_ON_START) - -rm valgrind.* + -rm -f opt_test.vim test.log test_result.log messages + -rm -f $(RM_ON_RUN) $(RM_ON_START) + -rm -f valgrind.* test1.out: test1.in -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize diff --git a/src/version.c b/src/version.c index 82e9e3842..13db30461 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1505, /**/ 1504, /**/ -- 2.50.1