summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-26 13:46:02 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-26 13:46:02 +0000
commit43b4bae567b4580fbfcb143b7812ce180144959c (patch)
treecf69a75aee02c3658222dcdcc5c04b24b6654f0f /win32
parentcf7dae0e17e831140a46b2380339705edf0cbe3b (diff)
* win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub4
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a8fb2b889d..67ebf9afc7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -70,6 +70,7 @@ PURIFY =
AUTOCONF = autoconf
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 rmdir /s /q
CP = copy > nul
@@ -730,6 +731,7 @@ s,@ARFLAGS@,$(ARFLAGS),;t t
s,@LN_S@,$(LN_S),;t t
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,@LIBOBJS@,$(LIBOBJS),;t t
@@ -928,7 +930,7 @@ clean-extout:
clean-enc distclean-enc realclean-enc:
!if exist($(ENC_MK))
@echo $(@:-enc=ing) encodings
- @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F)
+ @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
!endif
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb