From a21146a57503dcda22c6764afe6f67e9be5468ac Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jan 2009 09:23:03 +0000
Subject: 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
---
 Makefile.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 776c08d53f..f4a4f785db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
+top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
 
 CC = @CC@
@@ -94,6 +95,7 @@ MAKEDIRS      = @MAKEDIRS@
 CP            = cp
 MV            = mv
 RM            = rm -f
+RMDIRS        = @RMDIRS@
 NM            = @NM@
 AR            = @AR@
 ARFLAGS       = rcu
@@ -219,8 +221,12 @@ clean-local::
 
 distclean-local::
 	@$(RM) ext/config.cache $(RBCONFIG)
-	-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
-	-rmdir -p $(arch_hdrdir)/ruby
+	@-$(RM) run.gdb
+	@-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
+	@-$(RMDIRS) $(arch_hdrdir)/ruby
+
+distclean-rdoc:
+	@$(RMALL) $(RDOCOUT:/=\)
 
 clean-ext distclean-ext realclean-ext::
 	@set dummy ${EXTS}; shift; \
@@ -228,13 +234,13 @@ clean-ext distclean-ext realclean-ext::
 	    set dummy `find ext -name Makefile | sed 's:^ext/::;s:/Makefile$$::' | sort`; \
 	    shift; \
 	fi; \
-	cd ext; \
 	for dir; do \
+	    [ -f "ext/$$dir/Makefile" ] || continue; \
 	    echo $(@:-ext=)ing "$$dir"; \
-	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
 	    case "$@" in \
 	    *distclean-ext*|*realclean-ext*) \
-		rmdir -p "$$dir" 2> /dev/null;; \
+		$(RMDIRS) "ext/$$dir";; \
 	    esac; \
 	done
 
-- 
cgit v1.2.3