Fix bug #18302 with minor issues in the MSYS2/MinGW64 build.

 configure.ac: Accept "*-mingw*", not just "*-mingw32", as
 canonical name of a MinGW build, because using MSYS2 'uname'
 produces "MINGW64".

 src/Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
 if the initial "rm -f" fails.  This is for MinGW builds, where
 MS-Windows will not allow deleting the executable file of a
 running program.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d2e75577b9..90c66eb4705 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-23  Karol Ostrovsky  <karol.ostrovsky@gmail.com>  (tiny change)
+
+        * Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
+        if the initial "rm -f" fails.  This is for MinGW builds, where
+        MS-Windows will not allow deleting the executable file of a
+        running program.
+
 2014-08-20  Eli Zaretskii  <eliz@gnu.org>
 
         * w32term.c (w32_scroll_bar_handle_click)
diff --git a/src/Makefile.in b/src/Makefile.in
index 0dc48868dd8..3f1192fe3ff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -435,7 +435,9 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
         else \
           LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
           test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
-          rm -f bootstrap-emacs$(EXEEXT); \
+          while test -f bootstrap-emacs$(EXEEXT); do \
+            rm -f bootstrap-emacs$(EXEEXT); \
+          done; \
           ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
         fi