[前][次][番号順一覧][スレッド一覧]

ruby-changes:11116

From: nobu <ko1@a...>
Date: Tue, 3 Mar 2009 14:53:33 +0900 (JST)
Subject: [ruby-changes:11116] Ruby:r22715 (trunk): * common.mk (main): passes $(MAKE) to mkmain_cmd

nobu	2009-03-03 14:53:18 +0900 (Tue, 03 Mar 2009)

  New Revision: 22715

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22715

  Log:
    * common.mk (main): passes $(MAKE) to mkmain_cmd
    * ext/extmk.rb (command_output): uses arguments to invoke make.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22714)
+++ ChangeLog	(revision 22715)
@@ -1,3 +1,9 @@
+Tue Mar  3 14:53:16 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@f...>
 
 	* lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding.
Index: common.mk
===================================================================
--- common.mk	(revision 22714)
+++ common.mk	(revision 22715)
@@ -125,7 +125,7 @@
 all: encs exts main
 
 main: exts
-	@$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE)
+	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
 
 exts: $(MKMAIN_CMD)
 
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 22714)
+++ ext/extmk.rb	(revision 22715)
@@ -565,13 +565,13 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]