summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-20 13:51:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-20 13:51:48 +0000
commit2b923afbb29b1ef17c36694d4bd62c57b279ecbf (patch)
treed3781366cbcc95b08b822cf653c1c4801129209e
parentf56372bfc2469f6b7856ec62c50f913cdda8794f (diff)
downloadruby-2b923afbb29b1ef17c36694d4bd62c57b279ecbf.tar.gz
ruby-2b923afbb29b1ef17c36694d4bd62c57b279ecbf.tar.xz
ruby-2b923afbb29b1ef17c36694d4bd62c57b279ecbf.zip
* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
create_makefile. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9db0a85c0..931e478a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (mkmf_failed): check if Makefile is created without
+ create_makefile.
+
Sat Mar 19 23:48:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg): returned true always.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c0066126a..3266abace 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1183,7 +1183,7 @@ Provided configuration options:
MESSAGE
def mkmf_failed(path)
- unless $makefile_created
+ unless $makefile_created or File.exist?("Makefile")
opts = $arg_config.collect {|t, n| "\t#{t}#{"=#{n}" if n}\n"}
abort "*** #{path} failed ***\n" + FailedMessage + opts.join
end