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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bcf2417dbd..75667edfe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+	  [ruby-dev:39153]
+
 Tue Oct 20 14:50:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_here_document): dispatch delayed heredoc
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5a2d67f12b..06aeca96bd 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
diff --git a/version.h b/version.h
index 350992a0ca..cf1bd78490 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 362
+#define RUBY_PATCHLEVEL 363
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1