nagachika	2013-12-21 22:52:14 +0900 (Sat, 21 Dec 2013)

  New Revision: 44323

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

  Log:
    merge revision(s) 44307: [Backport #9199] [Backport #9272]
    
    * win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
      install win32.h.
      [ruby-core:58801][Bug #9199] reported by arton.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/Makefile.sub
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44322)
+++ ruby_2_0_0/ChangeLog	(revision 44323)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Dec 21 22:51:51 2013  NAKAMURA Usaku  <usa@r...>
+
+	* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
+	  install win32.h.
+	  [ruby-core:58801][Bug #9199] reported by arton.
+
 Sat Dec 21 16:16:56 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (finalize_deferred): flush all deferred finalizers while other
Index: ruby_2_0_0/win32/Makefile.sub
===================================================================
--- ruby_2_0_0/win32/Makefile.sub	(revision 44322)
+++ ruby_2_0_0/win32/Makefile.sub	(revision 44323)
@@ -1020,7 +1020,7 @@ class Object https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/Makefile.sub#L1020
   CROSS_COMPILING = RUBY_PLATFORM
   remove_const :RUBY_PLATFORM
   remove_const :RUBY_VERSION
-  RUBY_PLATFORM = "$(ARCH)"
+  RUBY_PLATFORM = "$(arch)"
   RUBY_VERSION = "$(MAJOR).$(MINOR).$(TEENY)"
 end
 class File
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44322)
+++ ruby_2_0_0/version.h	(revision 44323)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-12-21"
-#define RUBY_PATCHLEVEL 366
+#define RUBY_PATCHLEVEL 367
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44307


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