diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 22:52:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 22:52:46 +0000 |
| commit | 76bb597728c0d9a2228367e0ecaf6b92b7ffdfd7 (patch) | |
| tree | 9dd9f3949be4a8df4c31e61d131f9bb58eacbefb /tool/mkconfig.rb | |
| parent | e63ab5d3ad289767eab49787e4e33390b0ce74e1 (diff) | |
mkconfig.rb: fix empty prefix
* tool/mkconfig.rb: vars["prefix"] may not set. [fix GH-643]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/mkconfig.rb')
| -rwxr-xr-x | tool/mkconfig.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 79c97fa490..85b5ca45a5 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -167,8 +167,8 @@ def vars.expand(val, config = self) val.replace(newval) unless newval == val val end -prefix = vars.expand(vars["prefix"]) -rubyarchdir = vars.expand(vars["rubyarchdir"]) +prefix = vars.expand(vars["prefix"] ||= "") +rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir print " TOPDIR = File.dirname(__FILE__).chomp!(#{relative_archdir.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" |