diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-22 10:18:27 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-22 10:18:27 +0000 |
| commit | 4057bf0ce67bba9bd8ac0fc616dd06dc59715f4a (patch) | |
| tree | 9bbea675bffe087adb0b113ecbdb776a985c8992 | |
| parent | e39b6aaac254ca32849d3718f64d3f8f868b0c98 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Dec 22 18:08:42 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. + Fri Dec 20 17:52:50 2013 Koichi Sasada <ko1@atdot.net> * vm_method.c: check definition of @@ -1,11 +1,11 @@ #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" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 216fb9dcf3..305f37df55 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1040,7 +1040,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 |