yugui	2008-12-25 18:55:18 +0900 (Thu, 25 Dec 2008)

  New Revision: 21022

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

  Log:
    merges r20965 from trunk into ruby_1_9_1.
    * configure.in (Makefile): removes GNU make specific files on
      distclean.
    * Makefile.in (distclean-ext): removes extension directories.
    
    * lib/mkmf.rb (try_do): removes conftest.dSYM

  Modified files:
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/configure.in
    branches/ruby_1_9_1/lib/mkmf.rb

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 21021)
+++ ruby_1_9_1/configure.in	(revision 21022)
@@ -2140,6 +2140,8 @@
 	if test "$gnumake" != yes; then
 	    echo ['$(MKFILES): $(srcdir)/common.mk']
 	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	else
+	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
 	fi
       } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
 [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake])
Index: ruby_1_9_1/lib/mkmf.rb
===================================================================
--- ruby_1_9_1/lib/mkmf.rb	(revision 21021)
+++ ruby_1_9_1/lib/mkmf.rb	(revision 21022)
@@ -194,6 +194,10 @@
   FileUtils.rm_f(Dir[*files])
 end
 
+def rm_rf(*files)
+  FileUtils.rm_rf(Dir[*files])
+end
+
 # Returns time stamp of the +target+ file if it exists and is newer
 # than or equal to all of +times+.
 def modified?(target, times)
@@ -361,6 +365,7 @@
   xsystem(command)
 ensure
   log_src(src)
+  rm_rf 'conftest.dSYM'
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
@@ -1894,7 +1899,6 @@
 \t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
 
 distclean: clean
-\t\t@-$(RM_RF) conftest.dSYM
 \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
 
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21021)
+++ ruby_1_9_1/Makefile.in	(revision 21022)
@@ -224,7 +224,8 @@
 	@find ext -name Makefile | sort | while read mk; do \
 	    dir=`dirname "$$mk"`; \
 	    echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \
-	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)); \
+	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+	    test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \
 	done
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)

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