diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-21 13:52:14 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-21 13:52:14 +0000 |
| commit | 8058fde22fd6849976c2c6f3a76a2b684a837e74 (patch) | |
| tree | 5d33abee6a1d48e6818166ee5e4bc10f341d20e1 | |
| parent | 895a8da09f08c438219e625899d6c7b204af9f62 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Dec 21 22:51:51 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@ruby-lang.org> * gc.c (finalize_deferred): flush all deferred finalizers while other @@ -1,6 +1,6 @@ #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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index cf3cfb3fd1..5c5a241102 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1020,7 +1020,7 @@ class Object 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 |