summaryrefslogtreecommitdiffstats
path: root/mkconfig.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-24 16:52:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-24 16:52:00 +0000
commit1dd393d047556d9f0275e6e5c31de6aeefc1004d (patch)
tree36d2736a54d2a2f7af36102fcc4f0865f72d3491 /mkconfig.rb
parent2ba75fe78c6052d5c3144f76fa264ba464619bbd (diff)
downloadruby-1dd393d047556d9f0275e6e5c31de6aeefc1004d.tar.gz
ruby-1dd393d047556d9f0275e6e5c31de6aeefc1004d.tar.xz
ruby-1dd393d047556d9f0275e6e5c31de6aeefc1004d.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@10189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
-rw-r--r--mkconfig.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkconfig.rb b/mkconfig.rb
index e64490e28..559078aca 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -34,6 +34,7 @@ module RbConfig
v_fast = []
v_others = []
+vars = {}
has_version = false
File.foreach "config.status" do |line|
next if /^#/ =~ line
@@ -51,8 +52,10 @@ File.foreach "config.status" do |line|
next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
next if $so_name and /^RUBY_SO_NAME$/ =~ name
val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM
- 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