diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-08 18:21:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-08 18:21:47 +0000 |
| commit | 4c47a90894b22e4d8292add04b44b2ea458c867c (patch) | |
| tree | 379f1c431f51d59f01d9ce7977546cf1addf296a | |
| parent | 30cc5efa51cca3d330651f31dd35aa6b0a787962 (diff) | |
| download | ruby-4c47a90894b22e4d8292add04b44b2ea458c867c.tar.gz ruby-4c47a90894b22e4d8292add04b44b2ea458c867c.tar.xz ruby-4c47a90894b22e4d8292add04b44b2ea458c867c.zip | |
* mkconfig.rb: fix for continued lines. based on a patch from
Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | mkconfig.rb | 11 |
2 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Dec 9 03:21:37 2008 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]. + Tue Dec 9 00:54:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/make-snapshot (package): enc.mk in snapshot is dummy and should 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" |