patch 8.1.0500: cleaning up in src/tee may not always work

Problem:    Cleaning up in src/tee may not always work.
Solution:   Use "rm" when appropriate. (Michael Soyka, closes #3571)

diff --git a/src/tee/Makefile b/src/tee/Makefile
index 12c43d510000351852bd41df1c32e2b473f14d60..7419913ccb977713eca9334bfe58002b515631a4 100644 (file)
--- a/src/tee/Makefile
+++ b/src/tee/Makefile
@@ -3,6 +3,12 @@
 CC=gcc
 CFLAGS=-O2 -fno-strength-reduce
 
+ifneq (sh.exe, $(SHELL))
+DEL = rm
+else
+DEL = del
+endif
+
 tee.exe: tee.o
        $(CC) $(CFLAGS) -s -o $@ $<
 
@@ -10,6 +16,6 @@ tee.o: tee.c
        $(CC) $(CFLAGS) -c $<
 
 clean:
-       - del tee.o
-       - del tee.exe
+       - $(DEL) tee.o
+       - $(DEL) tee.exe
 

diff --git a/src/version.c b/src/version.c
index b1aa8aa43098df1adf7a4e7bbbb6d5e5a092c06e..9d700e2ba3dea0ae91b2d27e9d92689cca62d9fb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    500,
 /**/
     499,
 /**/