summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 16:40:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 16:40:22 +0000
commit2e1c29baba0fe10c86f2244665f0757c9ae76d60 (patch)
treec4f86b79ae25b481c116ff65c3cc73e92c0b5634
parent749fd32fa1c1702cdc4ac358a3aa30db1f2e00a1 (diff)
downloadruby-2e1c29baba0fe10c86f2244665f0757c9ae76d60.tar.gz
ruby-2e1c29baba0fe10c86f2244665f0757c9ae76d60.tar.xz
ruby-2e1c29baba0fe10c86f2244665f0757c9ae76d60.zip
* lib/mkmf.rb (depend_rules): inserts ruby to only headers.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d169520c6..7965d343c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 18 01:40:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (depend_rules): inserts ruby to only headers.
+
Tue Dec 18 01:21:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_encode_length): chomp eol style modifiers.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index aedb376e5..2c1016da8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1299,7 +1299,7 @@ def depend_rules(depend)
depend.each_line do |line|
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h
- line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))", '\&ruby/') if /^\s*\w+\s*=/ !~ line
+ line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
(cont ||= []) << line
next