summaryrefslogtreecommitdiffstats
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
commit88855f11e3287db650abba98c592d96fa551a5b7 (patch)
treef0e2801fc3b3b90eee99fa1c578488636fae06ef
parentdba3de4a5b332768e086b960f15134170dc04714 (diff)
downloadruby-88855f11e3287db650abba98c592d96fa551a5b7.tar.gz
ruby-88855f11e3287db650abba98c592d96fa551a5b7.tar.xz
ruby-88855f11e3287db650abba98c592d96fa551a5b7.zip
* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@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 ab616d77d..0a598bb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 11 15:26:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+
Mon Apr 11 12:09:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 54f381279..ecdb54d30 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 << %{