From 3da1f24e1e02fbbdd32305299d871a34fe3d54c8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 26 Jun 2013 14:03:38 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 5 ++--- version.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f651897cd..1e7790a4dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 26 22:42:36 2013 Nobuyoshi Nakada + + * 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 * lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ee89198143..d4d5846bfc 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -225,11 +225,10 @@ module MakeMakefile 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)" diff --git a/version.h b/version.h index 5f91816d00..01241ec964 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3