summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-20 02:44:16 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-20 02:44:16 +0000
commitb8da292663cf5767936593946e71c1e7f21aa13d (patch)
tree08d99862c92dd62136abdfcc3ca11447407eb840
parent774ec2e110b7e3f55841ee220b4bba0b93b79c8e (diff)
downloadruby-b8da292663cf5767936593946e71c1e7f21aa13d.tar.gz
ruby-b8da292663cf5767936593946e71c1e7f21aa13d.tar.xz
ruby-b8da292663cf5767936593946e71c1e7f21aa13d.zip
* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11195 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 51151b1a7..912bb9269 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 1e8033b91..036786045 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1495,8 +1495,7 @@ 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"
+ hdr << "#define " + w.split(/=/, 2).join(" ")
end
end
config_string('COMMON_HEADERS') do |s|