patch 8.1.1505: running "make clean" twice gives errors

Problem:    Running "make clean" twice gives errors.
Solution:   Add "-f" to "rm". (closes #4516)

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bf64a03837cc2d8c5ba719c5f646c87dcda8fffb..d3c1184e8c01c97bc9fef1162056d5379e9b7817 100644 (file)
--- 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 82e9e3842ff8c4cd9a9377359dd505ee7fd92ba1..13db30461b74f72abf23c747ecd67e5905ba1646 100644 (file)
--- 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,
 /**/