diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | template/fake.rb.in | 9 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Apr 7 02:05:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * template/fake.rb.in: not define $extout to make target in cwd. + Tue Apr 6 23:01:35 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * vm_core.h: Introduce UNINITIALIZED_VAR() macro. diff --git a/template/fake.rb.in b/template/fake.rb.in index df36b099f2..827fa6786d 100755 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -22,18 +22,19 @@ prehook = proc do 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) |