nobu	2010-04-24 16:20:28 +0900 (Sat, 24 Apr 2010)

  New Revision: 27472

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27472

  Log:
    * template/fake.rb.in: no need for hook if extmk.

  Modified files:
    trunk/ChangeLog
    trunk/template/fake.rb.in

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27471)
+++ ChangeLog	(revision 27472)
@@ -1,3 +1,7 @@
+Sat Apr 24 16:20:26 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* template/fake.rb.in: no need for hook if extmk.
+
 Sat Apr 24 14:40:20 2010  Tanaka Akira  <akr@f...>
 
 	* io.c: raise IOError when byte oriented operations occur with
Index: template/fake.rb.in
===================================================================
--- template/fake.rb.in	(revision 27471)
+++ template/fake.rb.in	(revision 27472)
@@ -18,17 +18,6 @@
 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 @@
   $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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/