shyouhei	2009-12-24 18:01:58 +0900 (Thu, 24 Dec 2009)

  New Revision: 26172

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

  Log:
    merge revision(s) 22931,23086:
    * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
      [ruby-core:20131]
    * common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
      ''\'' in such quotes.
    * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
      [ruby-core:20131]
    * mkconfig.rb (patchlevel): config.status may not contain
      PATCHLEVEL even if other version numbers exist.
    * ext/extmk.rb: MINIRUBY is given via make-flag.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/common.mk
    branches/ruby_1_8_7/ext/extmk.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/extmk.rb
===================================================================
--- ruby_1_8_7/ext/extmk.rb	(revision 26171)
+++ ruby_1_8_7/ext/extmk.rb	(revision 26172)
@@ -347,7 +347,7 @@
 
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
-  $ruby = CONFIG['MINIRUBY']
+  $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
 elsif sep = config_string('BUILD_FILE_SEPARATOR')
   $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
 else
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26171)
+++ ruby_1_8_7/ChangeLog	(revision 26172)
@@ -1,3 +1,27 @@
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb: MINIRUBY is given via make-flag.
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+	  [ruby-core:20131]
+
+Thu Dec 24 17:56:32 2009  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
+	  ''\'' in such quotes.
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+	  [ruby-core:20131]
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb (patchlevel): config.status may not contain
+	  PATCHLEVEL even if other version numbers exist.
+
 Thu Dec 24 17:50:35 2009  Yusuke Endoh  <mame@t...>
 
 	* ext/stringio/stringio.c (strio_init): rewind when reopened.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26171)
+++ ruby_1_8_7/version.h	(revision 26172)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091224
-#define RUBY_PATCHLEVEL 246
+#define RUBY_PATCHLEVEL 247
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/common.mk
===================================================================
--- ruby_1_8_7/common.mk	(revision 26171)
+++ ruby_1_8_7/common.mk	(revision 26172)
@@ -64,7 +64,8 @@
 		--extout="$(EXTOUT)" \
 		--mflags="$(MFLAGS)" \
 		--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
+EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
+		--make-flags="MINIRUBY='$(MINIRUBY)'" --
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \

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