diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 14:36:30 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-25 14:36:30 +0000 |
| commit | 252cdfe0bfbcbf49d4cc94b2a72518ef01f72e5d (patch) | |
| tree | 1abc53d4811f73b8ad6906cf6cacd477cc883581 /lib | |
| parent | fd9134e5e742a6c7a224ff719594a5ade6d0cd77 (diff) | |
merge revision(s) 37410:
* lib/mkmf.rb: fix for if config["libdir"] is nil.
* tool/make-snapshot: fix wrong regexp for releasing preview.
patched by mame.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8054e5eeb4..08053a9cb6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2198,7 +2198,7 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG) $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") |