merges r24984 and r24987 from trunk into ruby_1_9_1.

--
* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
  [ruby-dev:39345]
--
* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]

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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 67f9b97aa9..5a2d67f12b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -191,11 +191,11 @@ class Array
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[*files])
+  FileUtils.rm_f(Dir[*files.flatten(1)])
 end
 
 def rm_rf(*files)
-  FileUtils.rm_rf(Dir[*files])
+  FileUtils.rm_rf(Dir[*files.flatten(1)])
 end
 
 # Returns time stamp of the +target+ file if it exists and is newer