diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:37 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:37 +0000 |
| commit | 6ecdf87bdb690eb7de14de6d09e1c488ad70fb5f (patch) | |
| tree | 3c00115682146f9682887089b299f07528e56333 /mkconfig.rb | |
| parent | 17e1400805834a8c5f97332b5c8afd4634bbc154 (diff) | |
merges r20587 from trunk into ruby_1_9_1.
* 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/branches/ruby_1_9_1@20677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
| -rwxr-xr-x | mkconfig.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mkconfig.rb b/mkconfig.rb index e56af5d043..d6a9d03986 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -56,14 +56,13 @@ File.foreach "config.status" do |line| continued_name = name next end - when /^"(.+)"\s*(\\)?$/ + when /^"(.*)"\s*(\\)?$/ if continued_line continued_line << $1 - unless $2 - val = continued_line.join("") - name = continued_name - continued_line = nil - end + next if $2 + val = continued_line.join("") + name = continued_name + continued_line = nil end when /^(?:ac_given_)?INSTALL=(.*)/ v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" |