summaryrefslogtreecommitdiff
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
commit19acf638f874ebcab6cb80e8c71ff77a717a8894 (patch)
treef0e2801fc3b3b90eee99fa1c578488636fae06ef
parentb4b60e2c348ee0256580c24c133717d9bb6913fd (diff)
* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
git-svn-id: svn+ssh://ci.ruby-lang.org/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 ab616d77d7..0a598bb365 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 54f3812798..ecdb54d303 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 << %{