aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-17 06:58:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-17 06:58:41 +0000
commit59491ed3b06481a3991aca84aebb5e55e5a12edd (patch)
tree5f6d25da12e852faaebc3b33c805569329730d95
parentccdf3f11628947b28ec3d490227961019f99ad32 (diff)
downloadruby-59491ed3b06481a3991aca84aebb5e55e5a12edd.tar.gz
* lib/mkmf.rb: not check config.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 716c26fe2d..d8d80c951e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sun Aug 17 15:58:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Aug 17 15:58:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb: not check config.h.
* lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c4b5b59c54..3183940547 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -159,8 +159,7 @@ if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/rub
$topdir = $hdrdir
$top_srcdir = $hdrdir
$arch_hdrdir = $hdrdir + "/$(arch)"
-elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") and
- File.exist?("#{CONFIG["EXTOUT"]}/include/#{CONFIG["arch"]}/ruby/config.h")
+elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
$topdir ||= RbConfig::CONFIG["topdir"]
$arch_hdrdir = "$(extout)/include/$(arch)"
else