From a6aba4f6ca7f5e9122379a40284089264f05f369 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Dec 2007 06:19:11 +0000
Subject: 	* lib/mkmf.rb ($extmk): set true only when under ext/ or
 tool/.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 4 ++++
 lib/mkmf.rb | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 010bb913e..d4d54bef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 15:17:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb ($extmk): set true only when under ext/ or tool/.
+
 Sat Dec 22 15:14:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (encs, ext/ripper/ripper.c): needs MFLAGS.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 8e27296f8..d3528f52b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -145,7 +145,8 @@ end
 
 topdir = File.dirname(libdir = File.dirname(__FILE__))
 extdir = File.expand_path("ext", topdir)
-$extmk = File.expand_path($0)[0, topdir.size+1] == topdir+"/"
+path = File.expand_path($0)
+$extmk = path[0, topdir.size+1] == topdir+"/" && %r"ext/|tool/" !~ path[topdir.size+1..-1]
 if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
   $topdir = $hdrdir
   $top_srcdir = $hdrdir
-- 
cgit