mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/mkconfig.rb (program_transform_name): fix for multiple trans
rules for autoconf 2.61 or earlier. * tool/rbinstall.rb (program_transform_name): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9676023607
commit
232978b031
3 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
Wed Aug 26 19:51:13 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* tool/mkconfig.rb (program_transform_name): fix for multiple trans
|
||||
rules for autoconf 2.61 or earlier.
|
||||
|
||||
* tool/rbinstall.rb (program_transform_name): ditto.
|
||||
|
||||
Wed Aug 26 19:20:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* random.c (random_rand): unified random_int and random_float.
|
||||
|
|
|
@ -92,7 +92,7 @@ File.foreach "config.status" do |line|
|
|||
unless $install_name
|
||||
$install_name = "ruby"
|
||||
val.gsub!(/\$\$/, '$')
|
||||
val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do
|
||||
val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:(?!\3)(?:\\.|.))*)\3((?:(?!\3)(?:\\.|.))*)\3([gi]*)]) do
|
||||
|addr, cmd, sep, pat, rep, opt|
|
||||
if addr
|
||||
Regexp.new(addr[/\A\/(.*)\/\z/, 1]) =~ $install_name or next
|
||||
|
|
|
@ -384,7 +384,7 @@ install?(:local, :comm, :bin, :'bin-comm') do
|
|||
if trans = CONFIG["program_transform_name"]
|
||||
exp = []
|
||||
trans.gsub!(/\$\$/, '$')
|
||||
trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do
|
||||
trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:(?!\3)(?:\\.|.))*)\3((?:(?!\3)(?:\\.|.))*)\3([gi]*)]) do
|
||||
|addr, cmd, sep, pat, rep, opt|
|
||||
addr &&= Regexp.new(addr[/\A\/(.*)\/\z/, 1])
|
||||
case cmd
|
||||
|
|
Loading…
Add table
Reference in a new issue