diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-08 07:16:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-08 07:16:49 +0000 |
| commit | b4164d8d6496f74dc78c10837a55b4eb79eab555 (patch) | |
| tree | 39eaf2829c13adc68b6a7375400c405329f88e35 | |
| parent | d9fa99d70c2fd985531a95f4cf7586f4fd56b208 (diff) | |
| download | ruby-b4164d8d6496f74dc78c10837a55b4eb79eab555.tar.gz ruby-b4164d8d6496f74dc78c10837a55b4eb79eab555.tar.xz ruby-b4164d8d6496f74dc78c10837a55b4eb79eab555.zip | |
* lib/rubygems/defaults.rb (Gem::default_dir): removed a clause
doing nothing.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Dec 8 16:16:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rubygems/defaults.rb (Gem::default_dir): removed a clause + doing nothing. + Tue Dec 8 03:50:24 2009 Tanaka Akira <akr@fsij.org> * file.c (rb_f_test): use string form in unknown command error diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index 24314d8bf..c9680104c 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -20,13 +20,9 @@ module Gem if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - elsif RUBY_VERSION >= '1.9.2' then + elsif ConfigMap[:rubylibprefix] then File.join(ConfigMap[:rubylibprefix], 'gems', ConfigMap[:ruby_version]) - # only Ruby 1.9.1 has a peculiar feature - elsif RUBY_VERSION > '1.9' and - File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', - ConfigMap[:ruby_version]) else File.join(ConfigMap[:libdir], ruby_engine, 'gems', ConfigMap[:ruby_version]) |