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 | 7a9faa952923bc4ac253f524f93727454f7a6381 (patch) | |
| tree | 7341e1ab41eb165fce56e68694d9e4f788df0c5a | |
| parent | bd6b19fe635a12c119be291d477a498abb961b2a (diff) | |
| download | ruby-7a9faa952923bc4ac253f524f93727454f7a6381.tar.gz ruby-7a9faa952923bc4ac253f524f93727454f7a6381.tar.xz ruby-7a9faa952923bc4ac253f524f93727454f7a6381.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@24671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 2 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
3 files changed, 9 insertions, 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. diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 0c16df8e0..ca1f46713 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 b10772656..9607539a4 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 |