summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-16 10:19:56 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-16 10:19:56 +0000
commit0a4ca8cfe82fb073aee6b7364315cbacd756446e (patch)
treef01081c5dfa44cbf9a378420ee71c9820c9dec03 /lib
parente3fb4697ac95d0e29795afabbe4dd22b1873dd5f (diff)
merge revision(s) 11194:11196:
* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 563ce9e5f4..0082059329 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1483,9 +1483,8 @@ EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
hdr = []
config_string('COMMON_MACROS') do |s|
- Shellwords.shellwords(s).each do |s|
- /(.*?)(?:=(.*))/ =~ s
- hdr << "#define #$1 #$2"
+ Shellwords.shellwords(s).each do |w|
+ hdr << "#define " + w.split(/=/, 2).join(" ")
end
end
config_string('COMMON_HEADERS') do |s|