archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merged r19975 and r19978 from ruby_1_9_1 into trunk.

Browse source 
* gem_prelude.rb: considers --program-suffix and prefix configure
  options.
* lib/rubygems/defaults.rb: ditto.
* test/rubygems/test_gem.rb (@default_dir_re): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-10-28 08:21:50 +00:00
parent b39833e1d7
commit e3e645f43a
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gem_prelude.rb
View file

@ -113,7 +113,7 @@ if defined?(Gem) then
undef_method :gem if method_defined? :gem
end
$".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
$".delete File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], 'rubygems.rb')
require 'rubygems'
@ -230,7 +230,7 @@ if defined?(Gem) then
begin
Gem.push_all_highest_version_gems_on_load_path
$" << File.join(Gem::ConfigMap[:libdir], "ruby",
$" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], "rubygems.rb")
rescue Exception => e
puts "Error loading gem paths on load path in gem_prelude"