diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 08:39:26 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-22 08:39:26 +0000 |
| commit | bc0963a204493687243d24737215ad8819d2212b (patch) | |
| tree | aaed876fb1179a9ca090a0cc7447b6bf37f04759 | |
| parent | b2a1dc616c9af33fc81b02dca617c4ce7c48b923 (diff) | |
| download | ruby-bc0963a204493687243d24737215ad8819d2212b.tar.gz | |
* lib/mkmf.rb ($extmk): fixed broken condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Sat Dec 22 17:39:03 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/mkmf.rb ($extmk): fixed broken condition. + Sat Dec 22 17:35:59 2007 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157. @@ -7,10 +11,6 @@ Sat Dec 22 17:35:59 2007 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/kconv.c (Kconv#kconv, to*): use self.encoding as from_enc when from_enc isn't given. -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 7cd62e5053..d93826cce3 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|enc|tool)/" =~ path[topdir.size+1..-1] +$extmk = path[0, topdir.size+1] == topdir+"/" && %r"\A(ext|enc|tool)\z" =~ File.dirname(path[topdir.size+1..-1]) if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") $topdir = $hdrdir $top_srcdir = $hdrdir |