1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
yugui 2009-06-28 10:08:36 +00:00
parent 426afe1e67
commit 5d8bff6d90
3 changed files with 13 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Sun Jun 28 19:02:07 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* 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 <tadf@dotrb.org>
* complex.c: renamed some static functions.

View file

@ -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"],

View file

@ -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