aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-11 06:26:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-11 06:26:49 +0000
commit07f61642e49d48ca2551f533573832dbcfc7b486 (patch)
treeef063473ae4b7efd93493e4db43b33980720ff6d
parentfbe5252b144d401c79d72a3281459a08c1d75c1e (diff)
downloadruby-07f61642e49d48ca2551f533573832dbcfc7b486.tar.gz
* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8301 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 ce97f6c4ea..94f03c5cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 11 15:24:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+
Sat Apr 9 18:20:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/image.rb: support to create TkImage object without
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a9561cc7a5..07017597ca 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -862,7 +862,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
end
CONFIG.each do |key, var|
next if /^abs_/ =~ key
- next unless /^(?:src|top|(.*))dir$/ =~ key and $1
+ next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
end
mk << %{