Changeset View
Changeset View
Standalone View
Standalone View
lang/ruby22/files/patch-tool_mkconfig.rb
| --- tool/mkconfig.rb.orig 2013-05-27 03:20:03.501815638 +0000 | --- tool/mkconfig.rb.orig 2014-07-07 10:07:01.000000000 +0800 | ||||
| +++ tool/mkconfig.rb 2013-05-27 03:20:31.093814303 +0000 | +++ tool/mkconfig.rb 2014-12-28 03:22:15.377490192 +0800 | ||||
| @@ -173,7 +173,8 @@ | @@ -167,8 +167,9 @@ | ||||
| val.replace(newval) unless newval == val | |||||
| val | |||||
| end | end | ||||
| vars["prefix"] = "" | -prefix = vars.expand(vars["prefix"] ||= "") | ||||
| vars["exec_prefix"] = "" | -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('.') | ||||
| +prefix = "/lib/ruby/#{major}.#{minor}/#{arch}" | +rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}" | ||||
| print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" | 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" | print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" | ||||
| print <<'ARCH' if universal | |||||