yugui	2009-01-01 15:43:17 +0900 (Thu, 01 Jan 2009)

  New Revision: 21234

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21234

  Log:
    merges r21220 from trunk into ruby_1_9_1.
    * Makefile.in (distclean-ext, realclean-ext): use EXTS as default.
    * win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
      directory.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21233)
+++ ruby_1_9_1/ChangeLog	(revision 21234)
@@ -1,3 +1,10 @@
+Thu Jan  1 07:16:44 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (distclean-ext, realclean-ext): use EXTS as default.
+
+	* win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
+	  directory.
+
 Thu Jan  1 06:56:28 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* tool/file2lastrev.rb: unset PWD.
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 21233)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 21234)
@@ -692,9 +692,13 @@
 		    echo $(@:-ext=)ing %~nI & \
 		    cd %I & \
 		    $(MAKE) $(MFLAGS) $(@:-ext=) & \
-		    cd %CD% \
+		    cd %CD% & \
+		    rmdir %I \
 		)
 
+distclean-ext realclean-ext::
+		@-rmdir ext
+
 $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21233)
+++ ruby_1_9_1/Makefile.in	(revision 21234)
@@ -221,17 +221,24 @@
 	-rmdir -p $(arch_hdrdir)/ruby
 
 clean-ext distclean-ext realclean-ext::
-	@find ext -name Makefile | sort | while read mk; do \
-	    dir=`dirname "$$mk"`; \
-	    echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \
+	@set dummy ${EXTS}; shift; \
+	if test "$$#" = 0; then \
+	    set dummy `find ext -name Makefile | sed 's:^ext/::;s:/Makefile$$::' | sort`; \
+	    shift; \
+	fi; \
+	cd ext; \
+	for dir; do \
+	    echo $(@:-ext=)ing "$$dir"; \
 	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    if [ $@ == clean-ext ]; then \
-	    	true; \
-	    else \
-		rmdir -p "$$dir" 2> /dev/null; \
-	    fi; \
+	    case "$@" in \
+	    *distclean-ext*|*realclean-ext*) \
+		rmdir -p "$$dir" 2> /dev/null;; \
+	    esac; \
 	done
 
+distclean-ext realclean-ext::
+	@-rmdir ext 2> /dev/null || true
+
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/