1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gem_prelude.c (Gem.default_dir): follows the change on

Browse Source 
lib/rubygems/default.rb in r23879

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-28 16:22:14 +00:00
parent 0bd29ba216
commit 4a1f1ba66e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jun 28 23:10:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* gem_prelude.c (Gem.default_dir): follows the change on
lib/rubygems/default.rb in r23879
Sun Jun 28 23:32:11 2009 Tadayoshi Funaba <tadf@dotrb.org> Sun Jun 28 23:32:11 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (nucomp_div): raises ZeroDivisionError immediately * complex.c (nucomp_div): raises ZeroDivisionError immediately

7
gem_prelude.rb
View File

@ -112,8 +112,11 @@ if defined?(Gem) then
if defined? RUBY_FRAMEWORK_VERSION then if defined? RUBY_FRAMEWORK_VERSION then
File.join File.dirname(ConfigMap[:sitedir]), 'Gems', File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
ConfigMap[:ruby_version] ConfigMap[:ruby_version]
# 1.9.2dev reverted to 1.8 style path elsif RUBY_VERSION >= '1.9.2' then
elsif RUBY_VERSION > '1.9' and 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', File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
ConfigMap[:ruby_version]) ConfigMap[:ruby_version])
else else