From e2273eac85d03b504242c14b642778936f03f585 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 8 Dec 2008 18:21:47 +0000 Subject: * mkconfig.rb: fix for continued lines. based on a patch from Marcus Rueckert at [ruby-core:20420]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ mkconfig.rb | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d357bb6f6e..3fae684f56 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]. + Tue Dec 9 00:54:01 2008 Nobuyoshi Nakada * tool/make-snapshot (package): enc.mk in snapshot is dummy and should 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" -- cgit v1.2.3