ruby-changes:18367
From: kosaki <ko1@a...>
Date: Sun, 26 Dec 2010 22:46:11 +0900 (JST)
Subject: [ruby-changes:18367] Ruby:r30390 (trunk): * win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
kosaki 2010-12-26 22:46:02 +0900 (Sun, 26 Dec 2010) New Revision: 30390 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30390 Log: * win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322. Modified files: trunk/ChangeLog trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 30389) +++ ChangeLog (revision 30390) @@ -1,3 +1,7 @@ +Sun Dec 26 21:23:23 2010 <kosaki.motohiro@g...> + + * win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322. + Sun Dec 26 22:25:07 2010 Nobuyoshi Nakada <nobu@r...> * ext/ripper/depend (ripper.y): fix messages with nmake. Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 30389) +++ win32/Makefile.sub (revision 30390) @@ -70,6 +70,7 @@ 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,@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-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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/