diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-04 14:37:48 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-04 14:37:48 +0000 |
| commit | b501eda42f5ca7aa277e337d3cea933a0220d2af (patch) | |
| tree | 1fde7df18b32712bd3ed0305fbd21cf879192471 /tool | |
| parent | 3e23e2dd51221385c1225fbd18f2a380f25d9b77 (diff) | |
merge revision(s) 39284: [Backport #7860]
* tool/mkconfig.rb: remove prefix from rubyarchdir.
r39267 expands variables, it changes expansion timing,
breaks RbConfig::CONFIG["includedir"] and building
extension libraries with installed ruby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/mkconfig.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index e4a925cd51..92c765499f 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -167,7 +167,7 @@ def vars.expand(val, config = self) val end vars["prefix"] = "" -prefix = vars.expand(vars["rubyarchdir"]) +prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '') 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 |