diff options
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 13 | ||||
-rwxr-xr-x | win32/rmall.bat | 6 |
2 files changed, 2 insertions, 17 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0911fd0c87..37ae8283e7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -75,7 +75,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\rmall.bat +RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -r MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat CP = copy > nul MV = move > nul @@ -817,7 +817,7 @@ s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t s,@RMDIR@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,:t t s,@RMDIRS@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,;t t -s,@RMALL@,$$(COMSPEC) /C rmdir /s /q,;t t +s,@RMALL@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat -f -r,:t t s,@MAKEDIRS@,$$(COMSPEC) /E:ON /C $$(top_srcdir:/=\)\win32\makedirs.bat,;t t s,@LIBOBJS@,$(LIBOBJS),;t t s,@ALLOCA@,$(ALLOCA),;t t @@ -1002,15 +1002,6 @@ distclean-local:: -$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h verconf.h -$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby -clean-rdoc distclean-rdoc realclean-rdoc: - -$(Q)$(RMALL) $(RDOCOUT:/=\) -clean-capi distclean-capi realclean-capi: - -$(Q)$(RMALL) $(CAPIOUT:/=\) - -clean-platform: - $(Q)$(RM) $(PLATFORM_D:/=\) - -$(Q)$(RMDIR) $(PLATFORM_DIR:/=\) - clean-ext distclean-ext realclean-ext:: !if "$(EXTS)" != "" @for %I in ($(EXTS)) \ diff --git a/win32/rmall.bat b/win32/rmall.bat deleted file mode 100755 index f49a168930..0000000000 --- a/win32/rmall.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off
-
-if "%1" == "" goto :end
-if exist "%1" rmdir /s /q "%1"
-
-:end
|