diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-24 07:20:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-24 07:20:28 +0000 |
commit | ee1cfc11e33f205bdbfc569414da6f388d9f58d8 (patch) | |
tree | 57c31464087068ff3bf16094251990de1cfc4517 | |
parent | 02efdb484582dfc0b785a5d7f07d69333a262943 (diff) |
* template/fake.rb.in: no need for hook if extmk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | template/fake.rb.in | 26 |
2 files changed, 18 insertions, 12 deletions
@@ -1,3 +1,7 @@ +Sat Apr 24 16:20:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * template/fake.rb.in: no need for hook if extmk. + Sat Apr 24 14:40:20 2010 Tanaka Akira <akr@fsij.org> * io.c: raise IOError when byte oriented operations occur with diff --git a/template/fake.rb.in b/template/fake.rb.in index 827fa6786d..e47cb4d759 100755 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -18,17 +18,6 @@ if RUBY_PLATFORM =~ /mswin|bccwin|mingw/ end $:.unshift(File.expand_path("..", __FILE__)) -prehook = proc do - config = RbConfig::CONFIG - mkconfig = RbConfig::MAKEFILE_CONFIG - mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@") - 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"] - untrace_var(:$extmk, prehook) -end -trace_var(:$extmk, prehook) posthook = proc do config = RbConfig::CONFIG mkconfig = RbConfig::MAKEFILE_CONFIG @@ -37,4 +26,17 @@ posthook = proc do $ruby = baseruby untrace_var(:$ruby, posthook) end -trace_var(:$ruby, posthook) +prehook = proc do |extmk| + unless extmk + config = RbConfig::CONFIG + mkconfig = RbConfig::MAKEFILE_CONFIG + mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@") + 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"] + trace_var(:$ruby, posthook) + end + untrace_var(:$extmk, prehook) +end +trace_var(:$extmk, prehook) |