summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-26 11:18:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-26 11:18:00 +0000
commitd2214aa2fb317cec985a4e4c20c01dfe42747a74 (patch)
tree67e192f8e35c1e46b0feca469d87068537bdf39e
parentd75996ec8ab58195c0442c4a891e567030b286b1 (diff)
* lib/rake.rb: use RbConfig::CONFIG instead of Config::CONFIG.
* lib/rbconfig/datadir.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rwxr-xr-xlib/rake.rb2
-rw-r--r--lib/rbconfig/datadir.rb8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7250e0840e..835d2ebb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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