mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
merge revision(s) 20587:
* mkconfig.rb: fix for continued lines. based on a patch from Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5a7338d85c
commit
ff8f8c190b
2 changed files with 10 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
|||
Mon Oct 17 04:20:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* mkconfig.rb: fix for continued lines. based on a patch from
|
||||
Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
|
||||
|
||||
Mon Oct 17 04:19:39 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* numeric.c (flo_cmp): Infinity is greater than any bignum
|
||||
|
|
|
@ -56,15 +56,14 @@ File.foreach "config.status" do |line|
|
|||
continued_name = name
|
||||
next
|
||||
end
|
||||
when /^"(.+)"\s*(\\)?$/
|
||||
when /^"(.*)"\s*(\\)?$/
|
||||
if continued_line
|
||||
continued_line << $1
|
||||
unless $2
|
||||
next if $2
|
||||
val = continued_line.join("")
|
||||
name = continued_name
|
||||
continued_line = nil
|
||||
end
|
||||
end
|
||||
when /^(?:ac_given_)?INSTALL=(.*)/
|
||||
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue