From af0221e728742adb34aa5e2abfcefa899ccd1867 Mon Sep 17 00:00:00 2001 From: drbrain Date: Fri, 31 Oct 2008 22:27:35 +0000 Subject: Don't require rubygems/defaults from gem_prelude.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20085 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 315d12a484..7884fad83d 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 v1.2.3