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 85017d89f79a466c01e3d4158d06d7d7500ba940..06ec7b6dc517d2bb82490fab48f71b69dcf6afff 100644 (file)
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -29,7 +29,7 @@ LDFLAGS += -static-libgcc -static-libstdc++
 endif
 
 ifeq ($(CROSS),yes)
-DEL = rm
+DEL = rm -f
 ifeq ($(MINGWOLD),yes)
 CXXFLAGS := -O2 -fvtable-thunks
 else
@@ -38,7 +38,7 @@ endif
 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 a0c10b1130bb64cfc46f5fb5f3bf06bae3b63cfc..bd9d0ac9453a0bf52317026f6e96a1bb826eecd0 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -184,7 +184,7 @@ ifeq ($(CROSS),yes)
  ifndef CROSS_COMPILE
 CROSS_COMPILE = i586-pc-mingw32msvc-
  endif
-DEL = rm
+DEL = rm -f
 MKDIR = mkdir -p
 DIRSLASH = /
 else
@@ -212,7 +212,7 @@ CROSS_COMPILE =
 # 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 01aea1f24d20dc902ecf725224903cade79b6288..e16ad291a4ead79b957a78309d471be690f7dbb3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    623,
 /**/
     622,
 /**/

diff --git a/src/xxd/Make_ming.mak b/src/xxd/Make_ming.mak
index 2d32261314e43ec391abb0fe29ef404e8e604044..e621e67841be931387ade558837631b55418ebf7 100644 (file)
--- a/src/xxd/Make_ming.mak
+++ b/src/xxd/Make_ming.mak
@@ -16,7 +16,7 @@ CC = gcc
 CFLAGS = -O2 -Wall -DWIN32 $(DEFINES)
 
 ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
 else
 DEL = del
 endif