ruby-changes:17958
From: nobu <ko1@a...>
Date: Mon, 29 Nov 2010 23:03:28 +0900 (JST)
Subject: [ruby-changes:17958] Ruby:r29975 (trunk): * win32/Makefile.sub (scriptbin.mk): fix generated rules.
nobu 2010-11-29 22:53:16 +0900 (Mon, 29 Nov 2010) New Revision: 29975 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29975 Log: * win32/Makefile.sub (scriptbin.mk): fix generated rules. Modified files: trunk/ChangeLog trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 29974) +++ ChangeLog (revision 29975) @@ -1,5 +1,7 @@ -Mon Nov 29 22:52:23 2010 Nobuyoshi Nakada <nobu@r...> +Mon Nov 29 22:53:13 2010 Nobuyoshi Nakada <nobu@r...> + * win32/Makefile.sub (scriptbin.mk): fix generated rules. + * win32/win32.c (rb_w32_write_console): fix argument type. Mon Nov 29 21:12:51 2010 Nobuyoshi Nakada <nobu@r...> Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 29974) +++ win32/Makefile.sub (revision 29975) @@ -361,8 +361,8 @@ !endif !if [for %I in ($(srcdir:/=\)\bin\*) do @for %J in (\ "%~nI.exe: $$(srcdir)/bin/%~nI" \ -" @echo generating $$@" \ -" @copy /b $$(STUBPROGRAM) +<< +$$(srcdir:/=\)\bin\%~nI $$@ > nul" \ +" @echo generating $$(@)" \ +" @copy /b $$(STUBPROGRAM) +<< +$$(srcdir:/=\)\bin\%~nI $$(@) > nul" \ "" "<<" "" \ ) do @echo.%~J>>scriptbin.mk] !else @@ -404,7 +404,7 @@ @exit 1 !endif -$(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in +$(MKFILES): $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in $(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args) @echo $(MKFILES) should be updated, re-run $(MAKE). @exit 1 @@ -843,7 +843,7 @@ !endif !if "$(STUBPROGRAM)" != "" -$(STUBPROGRAM): stub.$(OBJEXT) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res +$(STUBPROGRAM): stub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(ECHO) linking $(@:\=/) $(Q) $(PURIFY) $(CC) stub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \ $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/