nobu	2013-02-25 14:41:16 +0900 (Mon, 25 Feb 2013)

  New Revision: 39488

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

  Log:
    mkmf.rb: default libdirname
    
    * lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
    * tool/rbinstall.rb: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
    trunk/tool/rbinstall.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39487)
+++ ChangeLog	(revision 39488)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 25 14:41:07 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
+
+	* tool/rbinstall.rb: ditto.
+
 Mon Feb 25 13:12:39 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (setup): find Setup file from target_os 1. by
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39487)
+++ lib/mkmf.rb	(revision 39488)
@@ -2339,7 +2339,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2339
     $LIBRUBYARG = ""
     $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
     $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-    $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"]})"]
+    $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"] || "libdir"})"]
     $DEFLIBPATH.unshift(".")
     $LIBPATH = []
     $INSTALLFILES = []
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 39487)
+++ tool/rbinstall.rb	(revision 39488)
@@ -304,7 +304,7 @@ rubyw_install_name = CONFIG["rubyw_insta https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L304
 goruby_install_name = "go" + ruby_install_name
 
 bindir = CONFIG["bindir", true]
-libdir = CONFIG[CONFIG["libdirname", true], true]
+libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
 rubyhdrdir = CONFIG["rubyhdrdir", true]
 archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
 rubylibdir = CONFIG["rubylibdir", true]

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