nagachika	2013-06-26 23:03:38 +0900 (Wed, 26 Jun 2013)

  New Revision: 41658

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

  Log:
    merge revision(s) 41648: [Backport #8115]
    
    * 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 directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41657)
+++ ruby_2_0_0/ChangeLog	(revision 41658)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Jun 26 22:42:36 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 02:25:52 2013  Akinori MUSHA  <knu@i...>
 
 	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 41657)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 41658)
@@ -225,11 +225,10 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L225
     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)"
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41657)
+++ ruby_2_0_0/version.h	(revision 41658)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-26"
-#define RUBY_PATCHLEVEL 242
+#define RUBY_PATCHLEVEL 243
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41648


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