ruby-changes:15352
From: nobu <ko1@a...>
Date: Wed, 7 Apr 2010 02:09:01 +0900 (JST)
Subject: [ruby-changes:15352] Ruby:r27242 (trunk): * template/fake.rb.in: not define $extout to make target in cwd.
nobu 2010-04-07 02:06:20 +0900 (Wed, 07 Apr 2010) New Revision: 27242 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27242 Log: * template/fake.rb.in: not define $extout to make target in cwd. Modified files: trunk/ChangeLog trunk/template/fake.rb.in Index: ChangeLog =================================================================== --- ChangeLog (revision 27241) +++ ChangeLog (revision 27242) @@ -1,3 +1,7 @@ +Wed Apr 7 02:05:41 2010 Nobuyoshi Nakada <nobu@r...> + + * template/fake.rb.in: not define $extout to make target in cwd. + Tue Apr 6 23:01:35 2010 KOSAKI Motohiro <kosaki.motohiro@g...> * vm_core.h: Introduce UNINITIALIZED_VAR() macro. Index: template/fake.rb.in =================================================================== --- template/fake.rb.in (revision 27241) +++ template/fake.rb.in (revision 27242) @@ -22,18 +22,19 @@ config = RbConfig::CONFIG mkconfig = RbConfig::MAKEFILE_CONFIG mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@") - $extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["topdir"]) - mkconfig["extout"] = config["extout"] = $extout mkconfig["rubyhdrdir"] = "$(top_srcdir)/include" + mkconfig["builddir"] = config["builddir"] = File.expand_path(File.dirname(__FILE__)) config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include") mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"] - mkconfig["archdir"] = config["archdir"] = File.expand_path(File.dirname(__FILE__)) untrace_var(:$extmk, prehook) end trace_var(:$extmk, prehook) posthook = proc do + config = RbConfig::CONFIG + mkconfig = RbConfig::MAKEFILE_CONFIG + extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["builddir"]) + $arch_hdrdir = "#{extout}/include/$(arch)" $ruby = baseruby - $arch_hdrdir = "$(extout)/include/$(arch)" untrace_var(:$ruby, posthook) end trace_var(:$ruby, posthook) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/