From 03f19e27ed9dc0b0110dce0108626d414e00fca2 Mon Sep 17 00:00:00 2001 From: eban Date: Fri, 20 Oct 2006 02:33:49 +0000 Subject: * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/mkmf.rb | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4382ebb60e..30aad5cbb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 20 10:47:43 2006 NAKAMURA Usaku + + * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS. + Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada * common.mk (NULLCMD): dummy command. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 45900fe0f7..d24a407f9f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1511,8 +1511,7 @@ EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip} hdr = [] config_string('COMMON_MACROS') do |s| Shellwords.shellwords(s).each do |w| - /(.*?)(?:=(.*))/ =~ w - hdr << "#define #$1 #$2" + hdr << "#define " + w.split(/=/, 2).join(" ") end end config_string('COMMON_HEADERS') do |s| -- cgit v1.2.3