merge revision(s) 21297:

	* ext/extmk.rb (extmake): does not use both of makefile.rb and
	  extconf.rb at the same time.
	* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 15 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 57a1703f49..b585724818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Feb 22 00:29:05 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): does not use both of makefile.rb and
+	  extconf.rb at the same time.
+
+	* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]
+
 Sun Feb 22 00:13:58 2009  Tanaka Akira  <akr@fsij.org>
 
 	* eval.c (rb_thread_schedule): Don't change status of threads which
diff --git a/ext/extmk.rb b/ext/extmk.rb
index cf7944679c..fbec8a5bdf 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -155,18 +155,17 @@ def extmake(target)
       begin
 	$extconf_h = nil
 	ok &&= extract_makefile(makefile)
+	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
 	if (($extconf_h && !File.exist?($extconf_h)) ||
 	    !(t = modified?(makefile, MTIMES)) ||
-	    ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
+	    [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
         then
 	  ok = false
           init_mkmf
 	  Logging::logfile 'mkmf.log'
 	  rm_f makefile
-	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
-	    load $0
-	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
-	    load $0
+	  if conf
+	    load $0 = conf
 	  else
 	    create_makefile(target)
 	  end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 31f4878b8b..de8dee1056 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1333,7 +1333,9 @@ site-install-rb: install-rb
   end
 
   mfile.print "$(RUBYARCHDIR)/" if $extout
-  mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
+  mfile.print "$(DLLIB): "
+  mfile.print "$(DEFFILE) " if makedef
+  mfile.print "$(OBJS) Makefile\n"
   mfile.print "\t@-$(RM) $@\n"
   mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout
   link_so = LINK_SO.gsub(/^/, "\t")
diff --git a/version.h b/version.h
index a66867e4c7..0a0630e5dd 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090222
-#define RUBY_PATCHLEVEL 348
+#define RUBY_PATCHLEVEL 349
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8