nobu	2009-09-18 06:36:53 +0900 (Fri, 18 Sep 2009)

  New Revision: 24984

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

  Log:
    * lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
      [ruby-dev:39345]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24983)
+++ ChangeLog	(revision 24984)
@@ -1,5 +1,8 @@
-Fri Sep 18 06:34:21 2009  Nobuyoshi Nakada  <nobu@r...>
+Fri Sep 18 06:36:51 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+	  [ruby-dev:39345]
+
 	* lib/mkmf.rb (create_header): open in binmode.
 
 Thu Sep 17 18:34:19 2009  Nobuyoshi Nakada  <nobu@r...>
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 24983)
+++ lib/mkmf.rb	(revision 24984)
@@ -195,13 +195,13 @@
 end
 
 def rm_f(*files)
-  opt = ([files.pop] if Hash === files.last)
-  FileUtils.rm_f(Dir[*files], *opt)
+  opt = (Hash === files.last ? [files.pop] : [])
+  FileUtils.rm_f(Dir[*files.flatten], *opt)
 end
 
 def rm_rf(*files)
-  opt = ([files.pop] if Hash === files.last)
-  FileUtils.rm_rf(Dir[*files], *opt)
+  opt = (Hash === files.last ? [files.pop] : [])
+  FileUtils.rm_rf(Dir[*files.flatten], *opt)
 end
 
 # Returns time stamp of the +target+ file if it exists and is newer

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