diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-20 08:34:53 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-20 08:34:53 +0000 |
| commit | 04946de81b657c439c46f3f3780182b3cc7f4821 (patch) | |
| tree | 6a57539965332280eabf8a66736b066052e73142 /ext/extmk.rb | |
| parent | 2d956bea23588a9a16a0d42149d8544e9a049689 (diff) | |
| download | ruby-04946de81b657c439c46f3f3780182b3cc7f4821.tar.gz | |
* mkconfig.rb: generate RbConfig instead of Config.
* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
lib/webrick/httpservlet/cgihandler.rb,
test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
Config.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
| -rw-r--r-- | ext/extmk.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 1b0222a1e6..8daf3ae38f 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -64,7 +64,7 @@ def extract_makefile(makefile, keep = true) unless installrb.empty? config = CONFIG.dup install_dirs(target_prefix).each {|var, val| config[var] = val} - FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true) + FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, verbose: true) end end return false @@ -116,9 +116,9 @@ def extmake(target) makefile = "./Makefile" ok = File.exist?(makefile) unless $ignore - Config::CONFIG["hdrdir"] = $hdrdir - Config::CONFIG["srcdir"] = $srcdir - Config::CONFIG["topdir"] = $topdir + RbConfig::CONFIG["hdrdir"] = $hdrdir + RbConfig::CONFIG["srcdir"] = $srcdir + RbConfig::CONFIG["topdir"] = $topdir CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1] CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}" CONFIG["topdir"] = $topdir @@ -183,8 +183,8 @@ def extmake(target) $extpath |= $LIBPATH end ensure - Config::CONFIG["srcdir"] = $top_srcdir - Config::CONFIG["topdir"] = topdir + RbConfig::CONFIG["srcdir"] = $top_srcdir + RbConfig::CONFIG["topdir"] = topdir CONFIG["srcdir"] = mk_srcdir CONFIG["topdir"] = mk_topdir CONFIG.delete("hdrdir") @@ -378,9 +378,9 @@ else end if $extout - Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir)) + RbConfig.expand(extout = "#$extout", RbConfig::CONFIG.merge("topdir"=>$topdir)) if $install - Config.expand(dest = "#{$destdir}#{$rubylibdir}") + RbConfig.expand(dest = "#{$destdir}#{$rubylibdir}") FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun) exit end @@ -472,7 +472,7 @@ unless $destdir.to_s.empty? $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" end if !$extlist.empty? and $extupdate - rm_f(Config::CONFIG["LIBRUBY_SO"]) + rm_f(RbConfig::CONFIG["LIBRUBY_SO"]) end puts "making #{rubies.join(', ')}" $stdout.flush |