From a70a9172a663b0ef32ada4e4ea54017d5ca7325b Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 4 Nov 2008 13:36:46 +0000 Subject: merges r20085 from trunk into ruby_1_9_1. * Don't require rubygems/defaults from gem_prelude.rb. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/defaults.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index 315d12a48..7884fad83 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -20,9 +20,12 @@ module Gem if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - else + elsif RUBY_VERSION > '1.9' then File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', ConfigMap[:ruby_version]) + else + File.join(ConfigMap[:libdir], ruby_engine, 'gems', + ConfigMap[:ruby_version]) end end -- cgit