diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Dec 26 21:23:23 2010 <kosaki.motohiro@gmail.com> + + * win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322. + Sun Dec 26 22:25:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/ripper/depend (ripper.y): fix messages with nmake. 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 |