diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-09 09:07:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-09 09:07:42 +0000 |
| commit | 624ae6837937edb369020a9dabdb2a9e8ee5ae6b (patch) | |
| tree | a25d59bd43ae709e9cf406c4418f81cc285487d6 | |
| parent | c27f8d5b3a939befbbb7d206195693835a8e0dcb (diff) | |
* lib/mkmf.rb (create_makefile): prevent substitution of macro
definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,7 +1,10 @@ -Sun Jul 9 18:04:14 2006 Nobuyoshi Nakada <[email protected]> +Sun Jul 9 18:06:47 2006 Nobuyoshi Nakada <[email protected]> * lib/mkmf.rb (try_constant): fix for value 1 at cross compiling. + * lib/mkmf.rb (create_makefile): prevent substitution of macro + definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02 + Sun Jul 9 07:58:48 2006 Ryan Davis <[email protected]> * lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c72388ab6a..497a14424b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1248,7 +1248,7 @@ site-install-rb: install-rb suffixes << m[1] << m[2] implicit = [[m[1], m[2]], [m.post_match]] next - elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line + elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m} end depout << line |