diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/extmk.rb | 2 | ||||
| -rwxr-xr-x | instruby.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_config.rb | 2 |
5 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,13 @@ +Fri May 1 01:31:19 2009 Tanaka Akira <akr@fsij.org> + + * ext/extmk.rb: use RbConfig instead of Config. + + * instruby.rb: ditto. + + * lib/rubygems.rb: ditto. + + * test/rubygems/test_config.rb: ditto. + Thu Apr 30 21:23:30 2009 Tanaka Akira <akr@fsij.org> * runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG. diff --git a/ext/extmk.rb b/ext/extmk.rb index f69b57b112..30de287cd8 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -540,7 +540,7 @@ rubies = [] %w[RUBY RUBYW STATIC_RUBY].each {|n| r = n if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME") - rubies << Config.expand(r+=EXEEXT) + rubies << RbConfig.expand(r+=EXEEXT) $mflags << "#{n}=#{r}" end } diff --git a/instruby.rb b/instruby.rb index 4cb27848d1..20ce449214 100755 --- a/instruby.rb +++ b/instruby.rb @@ -101,13 +101,13 @@ def parse_args(argv = ARGV) $destdir ||= $mflags.defined?("DESTDIR") if $extout ||= $mflags.defined?("EXTOUT") - Config.expand($extout) + RbConfig.expand($extout) end $continue = $mflags.set?(?k) if $installed_list ||= $mflags.defined?('INSTALLED_LIST') - Config.expand($installed_list, RbConfig::CONFIG) + RbConfig.expand($installed_list, RbConfig::CONFIG) $installed_list = open($installed_list, "ab") $installed_list.sync = true end diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 77930016fa..3be98d3c56 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -823,7 +823,7 @@ module Gem end -module Config +module RbConfig # :stopdoc: class << self # Return the path to the data directory associated with the named diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index 4867538ac4..d57bbe7353 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -12,7 +12,7 @@ class TestConfig < RubyGemTestCase def test_datadir datadir = RbConfig::CONFIG['datadir'] - assert_equal "#{datadir}/xyz", Config.datadir('xyz') + assert_equal "#{datadir}/xyz", RbConfig.datadir('xyz') end end |