nobu	2010-01-29 11:09:51 +0900 (Fri, 29 Jan 2010)

  New Revision: 26465

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26465

  Log:
    * lib/mkmf.rb (try_do): log no source when no developement env.
    
    * lib/mkmf.rb (create_makefile): srcprefix always needs $(srcdir).
    
    * lib/mkmf.rb (create_makefile): yield configuration if a block is
      given.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26464)
+++ ChangeLog	(revision 26465)
@@ -1,3 +1,12 @@
+Fri Jan 29 11:09:49 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_do): log no source when no developement env.
+
+	* lib/mkmf.rb (create_makefile): srcprefix always needs $(srcdir).
+
+	* lib/mkmf.rb (create_makefile): yield configuration if a block is
+	  given.
+
 Fri Jan 29 09:43:30 2010  NARUSE, Yui  <naruse@r...>
 
 	* enc/trans/utf8_mac.trans (buf_shift_char): don't see uninitialised
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 26464)
+++ lib/mkmf.rb	(revision 26465)
@@ -367,11 +367,13 @@
 You have to install development tools first.
 MSG
   end
-  src = create_tmpsrc(src, &b)
-  xsystem(command)
-ensure
-  log_src(src)
-  rm_rf 'conftest.dSYM'
+  begin
+    src = create_tmpsrc(src, &b)
+    xsystem(command)
+  ensure
+    log_src(src)
+    rm_rf 'conftest.dSYM'
+  end
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
@@ -1682,8 +1684,8 @@
     target_prefix = ""
   end
 
-  srcprefix ||= '$(srcdir)'
-  RbConfig::expand(srcdir = srcprefix.dup)
+  srcprefix = "$(srcdir)/#{srcprefix}".chomp('/')
+  RbConfig.expand(srcdir = srcprefix.dup)
 
   ext = ".#{$OBJEXT}"
   if not $objs
@@ -1735,7 +1737,9 @@
   dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
   staticlib = target ? "$(TARGET).#$LIBEXT" : ""
   mfile = open("Makefile", "wb")
-  mfile.print(*configuration(srcprefix))
+  conf = configuration(srcprefix)
+  conf = yield(conf) if block_given?
+  mfile.print(conf)
   mfile.print "
 libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
 LIBPATH = #{libpath}

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/