nobu	2013-02-22 11:33:44 +0900 (Fri, 22 Feb 2013)

  New Revision: 39371

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

  Log:
    mkmf.rb: adjust default library path
    
    * lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
      for multiarch.  [Bug #7874]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39370)
+++ ChangeLog	(revision 39371)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Feb 22 11:33:42 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
+	  for multiarch.  [Bug #7874]
+
 Fri Feb 22 11:10:00 2013  Zachary Scott  <zachary@z...>
 
 	* enum.c (Enumerable#chunk: Improved examples, grammar, and formatting
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39370)
+++ lib/mkmf.rb	(revision 39371)
@@ -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)" : "$(libdir)"]
+    $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"]})"]
     $DEFLIBPATH.unshift(".")
     $LIBPATH = []
     $INSTALLFILES = []

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