mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
d75996ec8a
commit
d2214aa2fb
3 changed files with 11 additions and 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>
|
Sun Apr 26 19:30:29 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* time.c (time_arg): unused variable removed.
|
* time.c (time_arg): unused variable removed.
|
||||||
|
|
|
@ -932,7 +932,7 @@ end
|
||||||
# added to the FileUtils utility functions.
|
# added to the FileUtils utility functions.
|
||||||
#
|
#
|
||||||
module FileUtils
|
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, '"\&"')
|
sub(/.*\s.*/m, '"\&"')
|
||||||
|
|
||||||
OPT_TABLE['sh'] = %w(noop verbose)
|
OPT_TABLE['sh'] = %w(noop verbose)
|
||||||
|
|
|
@ -5,17 +5,17 @@
|
||||||
#++
|
#++
|
||||||
|
|
||||||
|
|
||||||
module Config
|
module RbConfig
|
||||||
|
|
||||||
# Only define datadir if it doesn't already exist.
|
# 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
|
# Return the path to the data directory associated with the given
|
||||||
# package name. Normally this is just
|
# 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
|
# modified by packages like RubyGems to handle versioned data
|
||||||
# directories.
|
# directories.
|
||||||
def Config.datadir(package_name)
|
def RbConfig.datadir(package_name)
|
||||||
File.join(CONFIG['datadir'], package_name)
|
File.join(CONFIG['datadir'], package_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue