mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/trunk@39284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
11498d9b1e
commit
16d775d94e
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
Sun Feb 17 00:52:14 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* 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.
|
||||
|
||||
Sat Feb 16 20:51:17 2013 Kazuki Tsujimoto <kazuki@callcc.net>
|
||||
|
||||
* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue