From c5719d9a756391ff365d92d62523222a7066d819 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 May 2011 13:46:25 +0000
Subject: [PATCH] * tool/rbinstall.rb (gem): install gemspec of json.  fixed
 #4784

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 4 ++++
 tool/rbinstall.rb | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20cc4c658f..1a300df8af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 27 22:46:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): install gemspec of json.  fixed #4784
+
 Fri May 27 22:45:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (validate_enc_binmode): do not clear textmode flag if
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index fde24c0ecd..6234f6fe47 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -544,12 +544,13 @@ install?(:ext, :comm, :gem) do
 
   destdir = File.join(gpath, directories.grep(/^spec/)[0])
   default_gems = [
-    ['rake', 'rake.rb'],
-    ['rdoc', 'rdoc.rb'],
-    ['minitest', 'minitest/unit.rb'],
+    ['rake', 'lib/rake.rb'],
+    ['rdoc', 'lib/rdoc.rb'],
+    ['minitest', 'lib/minitest/unit.rb'],
+    ['json', 'ext/json/lib/json/version.rb'],
   ]
   default_gems.each do |name, src|
-    src = File.join(srcdir, "lib", src)
+    src = File.join(srcdir, src)
     version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
     version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
     puts "#{" "*30}#{name} #{version}"