summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-26 10:56:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-26 10:56:55 +0000
commit232978b0319ebb6235bdfc5a8c8dae58c6be1442 (patch)
tree7341e1ab41eb165fce56e68694d9e4f788df0c5a
parent96760236079b15674a6322a2ca41b1528b51afbd (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
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/mkconfig.rb2
-rwxr-xr-xtool/rbinstall.rb2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index de7888c..26cfd87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0c16df8..ca1f467 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 b107726..9607539 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