[前][次][番号順一覧][スレッド一覧]

ruby-changes:2992

From: ko1@a...
Date: 22 Dec 2007 18:08:03 +0900
Subject: [ruby-changes:2992] usa - Ruby:r14483 (trunk): * lib/mkmf.rb ($extmk): fixed broken condition.

usa	2007-12-22 17:39:26 +0900 (Sat, 22 Dec 2007)

  New Revision: 14483

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

  Log:
    * lib/mkmf.rb ($extmk): fixed broken condition.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14483&r2=14482
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=14483&r2=14482

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14482)
+++ ChangeLog	(revision 14483)
@@ -1,3 +1,7 @@
+Sat Dec 22 17:39:03 2007  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb ($extmk): fixed broken condition.
+
 Sat Dec 22 17:35:59 2007  NARUSE, Yui <naruse@r...>
 
 	* ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157.
@@ -7,10 +11,6 @@
 	* 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@r...>
-
-	* lib/mkmf.rb ($extmk): fixed broken condition.
-
 Sat Dec 22 17:06:50 2007  GOTOU Yuuzou  <gotoyuzo@n...>
 
 	* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext.build): removed.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 14482)
+++ lib/mkmf.rb	(revision 14483)
@@ -146,7 +146,7 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml

[前][次][番号順一覧][スレッド一覧]