From 23d60e1d686ae4a94c94db4989f1f1071b3d920a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20K=C3=BChne?= <unknown>
Date: Thu, 22 Feb 2018 08:13:37 +1100
Subject: Backport: Bug [#1993]. Fix building on Mingw/MSYS to perform file
 copies and deletions.

Backport of changeset 6457:26e7749ba67a.
---
 doc/ScintillaHistory.html | 4 ++++
 win32/makefile            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1734970e6..9f4d4a7be 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -585,6 +585,10 @@
 	position instead of the limit of the rectangular selection.
 	</li>
 	<li>
+	Fix building on Mingw/MSYS to perform file copies and deletions.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1993/">Bug #1993</a>.
+	</li>
+	<li>
 	Fix HTML lexer handling of Django so that nesting a  &#123;&#123; &#125;&#125; or &#123;% %&#125;
 	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
 	</li>
diff --git a/win32/makefile b/win32/makefile
index 62f5931ae..dcbd3ad2a 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -18,7 +18,7 @@ endif
 
 .SUFFIXES: .cxx
 ifeq ($(OS),Windows_NT)
-DEL = del /q
+DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
 else
 DEL = rm -f
 endif
-- 
cgit v1.2.3