summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2019-11-26 11:44:11 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2019-11-26 11:44:11 +0900
commit7bd7a013b14fb6c4403ff243ec5db13c5c71f552 (patch)
tree4f4ab763e031cf7dcab5035947c04fd2bf456d2f /win32
parent26625bc33c32e0945bf727234a3ce6da1eb0ddc4 (diff)
Fix `$(RMALL) -r` on Windows
`set recursive=1 &` sets `1 ` to `recursive`, not `1`.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub2
-rwxr-xr-xwin32/rm.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e273260..6594648 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -90,7 +90,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat
RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
-RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -r
+RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r
MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat
CP = copy > nul
MV = move > nul
diff --git a/win32/rm.bat b/win32/rm.bat
index 9496441..8dddf45 100755
--- a/win32/rm.bat
+++ b/win32/rm.bat
@@ -1,7 +1,7 @@
@echo off
:optloop
if "%1" == "-f" shift
-if "%1" == "-r" (shift & set recursive=1 & goto :optloop)
+if "%1" == "-r" (shift & set "recursive=1" & goto :optloop)
if "%recursive%" == "1" goto :recursive
:begin
if "%1" == "" goto :end