nobu	2013-06-26 16:42:13 +0900 (Wed, 26 Jun 2013)

  New Revision: 41648

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41648

  Log:
    mkmf.rb: use expanded values
    
    * lib/mkmf.rb: should use expanded values for header directories
      unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
      [Bug #8115], rhbz#921650.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41647)
+++ ChangeLog	(revision 41648)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jun 26 16:42:11 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb: should use expanded values for header directories
+	  unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
+	  [Bug #8115], rhbz#921650.
+
 Wed Jun 26 12:48:22 2013  Tanaka Akira  <akr@f...>
 
 	* bignum.c (bigxor_int): Fix a buffer over read.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 41647)
+++ lib/mkmf.rb	(revision 41648)
@@ -235,11 +235,10 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L235
     path = dir
   end
   $extmk ||= false
-  if not $extmk and File.exist?(RbConfig::CONFIG["rubyhdrdir"] + "/ruby/ruby.h")
-    $hdrdir = CONFIG["rubyhdrdir"]
+  if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
     $topdir = $hdrdir
     $top_srcdir = $hdrdir
-    $arch_hdrdir = CONFIG["rubyarchhdrdir"]
+    $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
   elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h")
     $topdir ||= RbConfig::CONFIG["topdir"]
     $arch_hdrdir = "$(extout)/include/$(arch)"

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