diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-06 13:14:46 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-06 13:14:46 +0000 |
| commit | 22e2bfc646dc7856d2f0a4b5d578db90af83fa75 (patch) | |
| tree | a97025733e383f0e83001b1934a1f65441394284 /tool | |
| parent | 3c8784c201051a3a7cc36e31b99c63dae0e547e0 (diff) | |
merge revision(s) 39297: [Backport #8032]
mkconfig.rb: clear exec_prefix
* tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
before expanding rubyarchdir to remove prefix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/mkconfig.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 92c765499f..d8e9f0f3b7 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -167,7 +167,8 @@ def vars.expand(val, config = self) val end vars["prefix"] = "" -prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '') +vars["exec_prefix"] = "" +prefix = vars.expand(vars["rubyarchdir"]) print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print <<'ARCH' if universal |