diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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 8e27296f8a..d3528f52bd 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 |