Changeset View
Changeset View
Standalone View
Standalone View
lang/ruby23/files/patch-tool_mkconfig.rb
| --- tool/mkconfig.rb.orig 2014-07-07 02:07:01 UTC | --- tool/mkconfig.rb.orig 2015-12-09 20:53:21 UTC | ||||
| +++ tool/mkconfig.rb | +++ tool/mkconfig.rb | ||||
| @@ -167,8 +167,9 @@ | @@ -168,8 +168,9 @@ def vars.expand(val, config = self) | ||||
| val.replace(newval) unless newval == val | val.replace(newval) unless newval == val | ||||
| val | val | ||||
| end | end | ||||
| -prefix = vars.expand(vars["prefix"] ||= "") | -prefix = vars.expand(vars["prefix"] ||= "") | ||||
| -rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") | -rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") | ||||
| +prefix = vars.expand(vars["rubyarchdir"]) | +prefix = vars.expand(vars["rubyarchdir"]) | ||||
| +major, minor, *rest = RUBY_VERSION.split('.') | +major, minor, *rest = RUBY_VERSION.split('.') | ||||
| +rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}" | +rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}" | ||||
| relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir | relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir | ||||
| print " TOPDIR = File.dirname(__FILE__).chomp!(#{relative_archdir.dump})\n" | puts %[\ | ||||
| print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" | # frozen-string-literal: false | ||||