From c2fdd98eb054fb5825061782ae610551ee00840c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Oct 2010 05:40:11 +0000
Subject: [PATCH] * lib/mkmf.rb: $extmk should be true for test/runner.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 4 ++++
 lib/mkmf.rb              | 2 +-
 test/mkmf/test_sizeof.rb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 919bc11ec1..1887be46fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 23 14:39:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: $extmk should be true for test/runner.
+
 Sat Oct 23 10:55:37 2010  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_dump.c (rb_vm_bugreport): fix to add bug outputs.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0af433a40f..4b196565ee 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -156,7 +156,7 @@ end
 topdir = File.dirname(File.dirname(__FILE__))
 path = File.expand_path($0)
 $extmk = path[0, topdir.size+1] == topdir+"/"
-$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1])
+$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+)?)\z" =~ File.dirname(path[topdir.size+1..-1])
 $extmk &&= true
 if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
   $topdir = $hdrdir
diff --git a/test/mkmf/test_sizeof.rb b/test/mkmf/test_sizeof.rb
index e1c498dc0a..d35811f3f6 100644
--- a/test/mkmf/test_sizeof.rb
+++ b/test/mkmf/test_sizeof.rb
@@ -6,7 +6,7 @@ class TestMkmf
       open("confdefs.h", "w") {|f|
         f.puts "typedef struct {char x;} test1_t;"
       }
-      assert_equal(1, mkmf {size = check_sizeof("test1_t", "confdefs.h")})
+      assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")})
     end
   end
 end