diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-24 16:52:00 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-24 16:52:00 +0000 |
| commit | aa9da28961945168b78712c309768e239147cc50 (patch) | |
| tree | f12bc4f4a80dd67952dfc212f466af955bb92e10 /mkconfig.rb | |
| parent | 0de571b69564ed8db69bfa87ddc028d2f1d8e3f1 (diff) | |
* mkconfig.rb: merge multiple entries to an entry with multiple lines.
* lib/mkmf.rb: allow a series of commands to link.
* win32/Makefile.sub: embed manifests.
* win32/setup.mak: suffix OS name by runtime version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
| -rw-r--r-- | mkconfig.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkconfig.rb b/mkconfig.rb index 1e91d65820..1208606aa1 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -34,6 +34,7 @@ module Config v_fast = [] v_others = [] +vars = {} has_version = false File.foreach "config.status" do |line| next if /^#/ =~ line @@ -50,8 +51,10 @@ File.foreach "config.status" do |line| next if /^\$ac_\w+$/ =~ val next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name - v = " CONFIG[\"" + name + "\"] = " + + v = " CONFIG[\"" + name + "\"] #{vars[name] ? '<<' : ''}= " + + (vars[name] ? '"\n" ' : '') + val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + "\n" + vars[name] = true if fast[name] v_fast << v else |