From 937b2747257f0919a1560b8b7e3ebe70ec620c6f Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 9 Jul 2006 09:07:42 +0000 Subject: * lib/mkmf.rb (create_makefile): prevent substitution of macro definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02 git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/mkmf.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a6128aea..0661dd980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -Sun Jul 9 18:04:14 2006 Nobuyoshi Nakada +Sun Jul 9 18:06:47 2006 Nobuyoshi Nakada * 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 * lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c72388ab6..497a14424 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 -- cgit