From 76bb597728c0d9a2228367e0ecaf6b92b7ffdfd7 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 27 Jun 2014 22:52:46 +0000 Subject: 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 --- tool/mkconfig.rb | 4 ++-- 1 file 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" -- cgit v1.2.3