diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Feb 25 14:41:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir. + + * tool/rbinstall.rb: ditto. + Mon Feb 25 13:12:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (setup): find Setup file from target_os 1. by diff --git a/lib/mkmf.rb b/lib/mkmf.rb index efa2982a23..b745b79823 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)" : "$(#{config["libdirname"]})"] + $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"] || "libdir"})"] $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = [] diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index f85465979c..0febf203dc 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -304,7 +304,7 @@ rubyw_install_name = CONFIG["rubyw_install_name"] 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] |