diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-29 13:53:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-29 13:53:16 +0000 |
| commit | f0a2b08b4461f9c6add51738679ec8e06e3e0fae (patch) | |
| tree | cb70d33d3362ea9cca7b86aa55fe501d494a8ac9 /win32 | |
| parent | 8fba2b63ec2a8c0f5e43606325af9a283dd90976 (diff) | |
* win32/Makefile.sub (scriptbin.mk): fix generated rules.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index f004c59360..e7334f6c17 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -361,8 +361,8 @@ stub: $(STUBPROGRAM) !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 @@ test-rubyspec-precheck: @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 @@ $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res !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) |