patch 9.1.0623: Mingw: errors when trying to delete non-existing files
Problem: Mingw: warnings when trying to delete non-existing files
Solution: Use "rm -f" instead of "rm" to suppress errors for
non-existing files (Ken Takata)
closes: #15350
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index 85017d8..06ec7b6 100644
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -29,7 +29,7 @@
endif
ifeq ($(CROSS),yes)
-DEL = rm
+DEL = rm -f
ifeq ($(MINGWOLD),yes)
CXXFLAGS := -O2 -fvtable-thunks
else
@@ -38,7 +38,7 @@
else
CXXFLAGS := -O2
ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
else
DEL = del
endif
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index a0c10b1..bd9d0ac 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -184,7 +184,7 @@
ifndef CROSS_COMPILE
CROSS_COMPILE = i586-pc-mingw32msvc-
endif
-DEL = rm
+DEL = rm -f
MKDIR = mkdir -p
DIRSLASH = /
else
@@ -212,7 +212,7 @@
# In this case, unix-like commands can be used.
#
ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
MKDIR = mkdir -p
DIRSLASH = /
else
diff --git a/src/version.c b/src/version.c
index 01aea1f..e16ad29 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 623,
+/**/
622,
/**/
621,
diff --git a/src/xxd/Make_ming.mak b/src/xxd/Make_ming.mak
index 2d32261..e621e67 100644
--- a/src/xxd/Make_ming.mak
+++ b/src/xxd/Make_ming.mak
@@ -16,7 +16,7 @@
CFLAGS = -O2 -Wall -DWIN32 $(DEFINES)
ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
else
DEL = del
endif