merges r21764 and r21765 from trunk into ruby_1_9_1.

* Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
  parents.

* Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
  temprary rdoc.

* Makefile.in, win32/Makefile.sub (distclean): removes extout
  directory.

* Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
  directories.

* common.mk (clean, distclean): cleans rdoc.

* common.mk (clean-extout): removes extout directory.

* configure.in (RMDIRS, RMALL): added to clean extout.

* lib/fileutils.rb (FileUtils#rmdir): added :parents option.

* lib/mkmf.rb (create_makefile): cleans installed files at clean
  instead of distclean.

* lib/mkmf.rb (create_makefile): added clean-so and clean-rb.

* lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.

* lib/un.rb (rmdir): added -p option.

* tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.

* win32/rm.bat: added -r option.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/win32/rm.bat b/win32/rm.bat
index eb415d67f9..83e3817287 100755
--- a/win32/rm.bat
+++ b/win32/rm.bat
@@ -1,8 +1,19 @@
 @echo off

+:optloop

 if "%1" == "-f" shift

+if "%1" == "-r" (set recursive=1 & goto :optloop)

+if "%recursive%" == "1" goto :recursive

 :begin

 if "%1" == "" goto :end

 if exist "%1" del "%1"

+set p=%1

+if exist "%p:/=\%" del "%p:/=\%"

 shift

 goto :begin

+:recursive

+if "%1" == "" goto :end

+set p=%1

+if exist "%p:/=\%" rd /s /q "%p:/=\%"

+shift

+goto :recursive

 :end