summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 08:32:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 08:32:53 +0000
commiteff45d2cc8a7a2fe51b04bd1c05496dbdb499a9a (patch)
tree26e2590f91265020021b59839f461d80454a6c9f
parent40aa32a0d7ce7a651a610cc69cced23319a11cd5 (diff)
* lib/mkmf.rb ($extmk): fixed broken condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 877e33bb61..eaca3b619f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 17:31:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb ($extmk): fixed broken condition.
+
Sat Dec 22 17:06:50 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext.build): removed.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index d3528f52bd..7cd62e5053 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -146,7 +146,7 @@ end
topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir)
path = File.expand_path($0)
-$extmk = path[0, topdir.size+1] == topdir+"/" && %r"ext/|tool/" !~ path[topdir.size+1..-1]
+$extmk = path[0, topdir.size+1] == topdir+"/" && %r"(ext|enc|tool)/" =~ path[topdir.size+1..-1]
if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
$topdir = $hdrdir
$top_srcdir = $hdrdir