diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 10:56:55 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 10:56:55 +0000 |
| commit | 232978b0319ebb6235bdfc5a8c8dae58c6be1442 (patch) | |
| tree | 7341e1ab41eb165fce56e68694d9e4f788df0c5a /tool | |
| parent | 96760236079b15674a6322a2ca41b1528b51afbd (diff) | |
* 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
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/mkconfig.rb | 2 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 0c16df8e03..ca1f46713a 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -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 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b107726562..9607539a4d 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -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 |