From f86a88610fc6a3d1a70be161ee5d5d6bf9f542e9 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 12 Dec 2008 14:54:37 +0000 Subject: merges r20587 from trunk into ruby_1_9_1. * mkconfig.rb: fix for continued lines. based on a patch from Marcus Rueckert at [ruby-core:20420]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ mkconfig.rb | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9391a4e4..7cc84f81b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 9 03:21:37 2008 Nobuyoshi Nakada + + * mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert at [ruby-core:20420]. + Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto * eval.c (rb_make_exception): single argument to raise may be diff --git a/mkconfig.rb b/mkconfig.rb index e56af5d04..d6a9d0398 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" -- cgit