From 2bf474b1a31a3600e2f94d11326c538580f757ca Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 20 Mar 2005 13:51:48 +0000 Subject: [PATCH] * lib/mkmf.rb (mkmf_failed): check if Makefile is created without create_makefile. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/mkmf.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7957857a3e..4fad314c7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada + + * lib/mkmf.rb (mkmf_failed): check if Makefile is created without + create_makefile. + Sat Mar 19 23:48:10 2005 Nobuyoshi Nakada * misc/ruby-mode.el (ruby-expr-beg): returned true always. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f15d0ead36..5263c4b07b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1053,7 +1053,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" + FailedMassage + opts.join end