merges r24620 from trunk into ruby_1_9_1. fixes the backport task #1976.

--
* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
  [ruby-dev:39153]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

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