diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 08:32:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 08:32:53 +0000 |
| commit | db2b630b93faf52e8bac409eeda6ba300cbae2cc (patch) | |
| tree | 26e2590f91265020021b59839f461d80454a6c9f | |
| parent | 8729ba2be9165bbb5aa368af7d7a253f4babae82 (diff) | |
| download | ruby-db2b630b93faf52e8bac409eeda6ba300cbae2cc.tar.gz ruby-db2b630b93faf52e8bac409eeda6ba300cbae2cc.tar.xz ruby-db2b630b93faf52e8bac409eeda6ba300cbae2cc.zip | |
* lib/mkmf.rb ($extmk): fixed broken condition.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 d3528f52b..7cd62e505 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 |