diff --git a/ChangeLog b/ChangeLog index 0421bd2960..572a956d91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 22 11:33:42 2013 Nobuyoshi Nakada + + * lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path + for multiarch. [Bug #7874] + Fri Feb 22 11:10:00 2013 Zachary Scott * enum.c (Enumerable#chunk: Improved examples, grammar, and formatting diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7ebc198202..efa2982a23 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2339,7 +2339,7 @@ site-install-rb: install-rb $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] + $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"]})"] $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = []