ruby-changes:2979
From: ko1@a...
Date: 22 Dec 2007 15:19:20 +0900
Subject: [ruby-changes:2979] usa - Ruby:r14470 (trunk): * lib/mkmf.rb ($extmk): set true only when under ext/ or tool/.
usa 2007-12-22 15:19:11 +0900 (Sat, 22 Dec 2007) New Revision: 14470 Modified files: trunk/ChangeLog trunk/lib/mkmf.rb Log: * lib/mkmf.rb ($extmk): set true only when under ext/ or tool/. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14470&r2=14469 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=14470&r2=14469 Index: ChangeLog =================================================================== --- ChangeLog (revision 14469) +++ ChangeLog (revision 14470) @@ -1,3 +1,7 @@ +Sat Dec 22 15:17:40 2007 NAKAMURA Usaku <usa@r...> + + * lib/mkmf.rb ($extmk): set true only when under ext/ or tool/. + Sat Dec 22 15:14:48 2007 Nobuyoshi Nakada <nobu@r...> * common.mk (encs, ext/ripper/ripper.c): needs MFLAGS. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 14469) +++ lib/mkmf.rb (revision 14470) @@ -145,7 +145,8 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml