diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | lib/rake.rb | 2 | ||||
| -rw-r--r-- | lib/rbconfig/datadir.rb | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Sun Apr 26 20:17:24 2009 Tanaka Akira <akr@fsij.org> + + * lib/rake.rb: use RbConfig::CONFIG instead of Config::CONFIG. + + * lib/rbconfig/datadir.rb: ditto. + Sun Apr 26 19:30:29 2009 Tanaka Akira <akr@fsij.org> * time.c (time_arg): unused variable removed. diff --git a/lib/rake.rb b/lib/rake.rb index 9a131e6d8f..c288e80b00 100755 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -932,7 +932,7 @@ end # added to the FileUtils utility functions. # module FileUtils - RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']). + RUBY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']). sub(/.*\s.*/m, '"\&"') OPT_TABLE['sh'] = %w(noop verbose) diff --git a/lib/rbconfig/datadir.rb b/lib/rbconfig/datadir.rb index d5493b3b04..74c014e0aa 100644 --- a/lib/rbconfig/datadir.rb +++ b/lib/rbconfig/datadir.rb @@ -5,17 +5,17 @@ #++ -module Config +module RbConfig # Only define datadir if it doesn't already exist. - unless Config.respond_to?(:datadir) + unless RbConfig.respond_to?(:datadir) # Return the path to the data directory associated with the given # package name. Normally this is just - # "#{Config::CONFIG['datadir']}/#{package_name}", but may be + # "#{RbConfig::CONFIG['datadir']}/#{package_name}", but may be # modified by packages like RubyGems to handle versioned data # directories. - def Config.datadir(package_name) + def RbConfig.datadir(package_name) File.join(CONFIG['datadir'], package_name) end |