nobu	2014-12-28 23:49:39 +0900 (Sun, 28 Dec 2014)

  New Revision: 49047

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

  Log:
    rbinstall.rb: fix bundled gems location
    
    * rbinstall.rb: fix target location for installing bundled gems.
      install to the prepared directory instead of default Gem.dir,
      not to be affected GEM_HOME environment variable.  [Fix GH-798]

  Modified files:
    trunk/ChangeLog
    trunk/tool/rbinstall.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49046)
+++ ChangeLog	(revision 49047)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Dec 28 23:49:37 2014  Michal Papis  <mpapis@g...>
+
+	* rbinstall.rb: fix target location for installing bundled gems.
+	  install to the prepared directory instead of default Gem.dir,
+	  not to be affected GEM_HOME environment variable.  [Fix GH-798]
+
 Sun Dec 28 18:19:28 2014  Eric Wong  <e@8...>
 
 	* test/-ext-/iseq_load/test_iseq_load.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 49046)
+++ tool/rbinstall.rb	(revision 49047)
@@ -719,7 +719,7 @@ install?(:ext, :comm, :gem) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L719
     directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
     prepare "bundle gems", gem_dir, directories
     Dir.glob(srcdir+'/gems/*.gem').each do |gem|
-      Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true
+      Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(gem_dir), :domain => :local, :ignore_dependencies => true
       gemname = Pathname(gem).basename
       puts "#{" "*30}#{gemname}"
     end

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