diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-28 10:08:36 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-28 10:08:36 +0000 |
| commit | 5d8bff6d904685f9c317cd04c5b6ae07165c02fb (patch) | |
| tree | 4e9191a78a7466dd3fcf6bc1e3525a6178628036 | |
| parent | 426afe1e67b2cba59cdc15f3c0b23b1bfbd9392a (diff) | |
* lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry
* lib/rubygems/defaults.rb (Gem.default_dir): considers
"--with-rubylibprefix" configure option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/rubygems.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 7 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Sun Jun 28 19:02:07 2009 Yuki Sonoda (Yugui) <[email protected]> + + * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry + + * lib/rubygems/defaults.rb (Gem.default_dir): considers + "--with-rubylibprefix" configure option. + Sun Jun 28 09:21:00 2009 Tadayoshi Funaba <[email protected]> * complex.c: renamed some static functions. diff --git a/lib/rubygems.rb b/lib/rubygems.rb index a4ce9b0a80..8e6d8c9636 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -173,6 +173,7 @@ module Gem :bindir => RbConfig::CONFIG["bindir"], :datadir => RbConfig::CONFIG["datadir"], :libdir => RbConfig::CONFIG["libdir"], + :rubylibprefix => RbConfig::CONFIG["rubylibprefix"], :ruby_install_name => RbConfig::CONFIG["ruby_install_name"], :ruby_version => RbConfig::CONFIG["ruby_version"], :sitedir => RbConfig::CONFIG["sitedir"], diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index 997f073835..24314d8bf1 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -20,8 +20,11 @@ module Gem if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - # 1.9.2dev reverted to 1.8 style path - elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2' then + elsif RUBY_VERSION >= '1.9.2' 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 |