usa	2012-12-25 23:36:30 +0900 (Tue, 25 Dec 2012)

  New Revision: 38606

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

  Log:
    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.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/mkmf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38605)
+++ ruby_1_9_3/ChangeLog	(revision 38606)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Dec 25 23:35:09 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/mkmf.rb: fix for if config["libdir"] is nil.
+
 Tue Dec 25 20:40:47 2012  NAKAMURA Usaku  <usa@r...>
 
 	* bignum.c, include/ruby/intern.h (rb_big_eql): exported.
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 38605)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 38606)
@@ -2198,7 +2198,7 @@ def init_mkmf(config = CONFIG, rbconfig https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/mkmf.rb#L2198
   $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")
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38605)
+++ ruby_1_9_3/version.h	(revision 38606)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37410


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