summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-01 18:24:39 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-01 18:24:39 +0000
commit072ab753ec04dc7578abeeeea23fe2d47e2d75fc (patch)
tree10a3ba8551b6ba78c1e9e369eb26523941646f3d
parentb2bbfb3e1836db4c48bc6ebae63af96be85d380b (diff)
lib/mkmf.rb: fix for if config["libdir"] is nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--lib/mkmf.rb2
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 479dd9ba25..5c6015a3cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+Fri Nov 2 03:23:37 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/mkmf.rb: fix for if config["libdir"] is nil.
+
Thu Nov 1 23:06:01 2012 NARUSE, Yui <naruse@ruby-lang.org>
- * tool/make-snapshot: fix wrong regexp for releasing preview.
- patched by mame.
+ * tool/make-snapshot: fix wrong regexp for releasing preview.
+ patched by mame.
Thu Nov 1 22:27:11 2012 Koichi Sasada <ko1@atdot.net>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0996392300..62b3c5f3f6 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2315,7 +2315,7 @@ site-install-rb: install-rb
$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")