naruse	2013-12-22 19:18:27 +0900 (Sun, 22 Dec 2013)

  New Revision: 44341

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

  Log:
    merge revision(s) 44307: [Backport #9271]
    
    * 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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/Makefile.sub
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44340)
+++ ruby_2_1/ChangeLog	(revision 44341)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Dec 22 18:08:42 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.
+
 Fri Dec 20 17:52:50 2013  Koichi Sasada  <ko1@a...>
 
 	* vm_method.c: check definition of
Index: ruby_2_1/win32/Makefile.sub
===================================================================
--- ruby_2_1/win32/Makefile.sub	(revision 44340)
+++ ruby_2_1/win32/Makefile.sub	(revision 44341)
@@ -1040,7 +1040,7 @@ class Object https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/Makefile.sub#L1040
   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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44340)
+++ ruby_2_1/version.h	(revision 44341)
@@ -1,11 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.0"
-#define RUBY_RELEASE_DATE "2013-12-20"
+#define RUBY_RELEASE_DATE "2013-12-22"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r44307


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