diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | ext/extmk.rb | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Mar 3 14:53:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (main): passes $(MAKE) to mkmain_cmd + + * ext/extmk.rb (command_output): uses arguments to invoke make. + Tue Mar 3 01:56:03 2009 Tanaka Akira <akr@fsij.org> * lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding. @@ -125,7 +125,7 @@ COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prel all: encs exts main main: exts - @$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE) + @$(RUNCMD) $(MKMAIN_CMD) $(MAKE) exts: $(MKMAIN_CMD) diff --git a/ext/extmk.rb b/ext/extmk.rb index adca9b4030..69002236c5 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -565,13 +565,13 @@ $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") if $command_output message = "echo #{message}" - cmd = [$make, *sysquote($makeflags)].join(' ') + cmd = sysquote($makeflags).join(' ') open($command_output, 'wb') do |f| case $command_output when /\.sh\z/ - f.puts message, "rm -f $0; exec #{cmd}" + f.puts message, "rm -f $0; exec \"$@\" #{cmd}" when /\.bat\z/ - ["@echo off", message, cmd, "del %0 & exit %ERRORLEVEL%"].each do |s| + ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s| f.print s, "\r\n" end else |