From 252cdfe0bfbcbf49d4cc94b2a72518ef01f72e5d Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 25 Dec 2012 14:36:30 +0000 Subject: merge revision(s) 37410: * lib/mkmf.rb: fix for if config["libdir"] is nil. * tool/make-snapshot: fix wrong regexp for releasing preview. patched by mame. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/mkmf.rb | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2332c5c0f1..f04301fe32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 25 23:35:09 2012 NARUSE, Yui + + * lib/mkmf.rb: fix for if config["libdir"] is nil. + Tue Dec 25 20:40:47 2012 NAKAMURA Usaku * bignum.c, include/ruby/intern.h (rb_big_eql): exported. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8054e5eeb4..08053a9cb6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2198,7 +2198,7 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG) $extout ||= nil $extout_prefix ||= nil - @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib" + @libdir_basename = config["libdir"] && config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] or "lib" $arg_config.clear dir_config("opt") diff --git a/version.h b/version.h index 75abe5cb81..f25888f484 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 361 +#define RUBY_PATCHLEVEL 362 #define RUBY_RELEASE_DATE "2012-12-25" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3