Permalink
Browse files

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
  • Loading branch information...
1 parent fd9134e commit 252cdfe0bfbcbf49d4cc94b2a72518ef01f72e5d @unak unak committed Dec 25, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −0 ChangeLog
  2. +1 −1 lib/mkmf.rb
  3. +1 −1 version.h
View
@@ -1,3 +1,7 @@
+Tue Dec 25 23:35:09 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/mkmf.rb: fix for if config["libdir"] is nil.
+
Tue Dec 25 20:40:47 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* bignum.c, include/ruby/intern.h (rb_big_eql): exported.
View
@@ -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")
View
@@ -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

0 comments on commit 252cdfe

Please sign in to comment.