merge revision(s) 51808: [Backport #11794]

	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f82ad1783..babd2d4808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 10 00:19:18 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
+
 Wed Dec  9 01:49:13 2015  Eric Wong  <e@80x24.org>
 
 	* insns.def (opt_case_dispatch): check Float#=== redefinition
diff --git a/common.mk b/common.mk
index c3c2b1fad0..f8def2fce9 100644
--- a/common.mk
+++ b/common.mk
@@ -903,7 +903,7 @@ update-config_files: PHONY
 
 update-gems: PHONY
 	$(ECHO) Downloading bundled gem files...
-	$(Q) $(RUNRUBY) -C "$(srcdir)/gems" \
+	$(Q) $(BASERUBY) -C "$(srcdir)/gems" \
 	    -I../tool -rdownloader -answ \
 	    -e 'gem, ver = *$$F' \
 	    -e 'old = Dir.glob("#{gem}-*.gem")' \
diff --git a/version.h b/version.h
index 26803ab0c0..bbc71317e6 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-12-09"
-#define RUBY_PATCHLEVEL 224
+#define RUBY_RELEASE_DATE "2015-12-10"
+#define RUBY_PATCHLEVEL 225
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"