summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-20 02:33:49 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-20 02:33:49 +0000
commit03f19e27ed9dc0b0110dce0108626d414e00fca2 (patch)
tree092a0900f6de0d4deaaea1838da687d4c8c152d2
parent40fc1a802516f5cd51d9bf741528bc06d3330c5f (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4382ebb..30aad5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 20 10:47:43 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
+
Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (NULLCMD): dummy command.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 45900fe..d24a407 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|