yugui	2008-12-29 16:19:41 +0900 (Mon, 29 Dec 2008)

  New Revision: 21161

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

  Log:
    merges r21149 from trunk into ruby_1_9_1.
    * Makefile.in (ext-clean): ext-clean always fails.
    * ext/dl/ripper/extconf.rb: adds y.output into the clean list.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/ext/ripper/extconf.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21160)
+++ ruby_1_9_1/ChangeLog	(revision 21161)
@@ -1,3 +1,9 @@
+Mon Dec 29 14:50:19 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* Makefile.in (ext-clean): ext-clean always fails.
+
+	* ext/dl/ripper/extconf.rb: adds y.output into the clean list.
+
 Mon Dec 29 11:58:39 2008  Koichi Sasada  <ko1@a...>
 
 	* thread.c (rb_mutex_trylock): return false if Mutex owned
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21160)
+++ ruby_1_9_1/Makefile.in	(revision 21161)
@@ -225,7 +225,11 @@
 	    dir=`dirname "$$mk"`; \
 	    echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \
 	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \
+	    if [ $@ == clean-ext ]; then \
+	    	true; \
+	    else \
+		rmdir -p "$$dir" 2> /dev/null; \
+	    fi; \
 	done
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
Index: ruby_1_9_1/ext/ripper/extconf.rb
===================================================================
--- ruby_1_9_1/ext/ripper/extconf.rb	(revision 21160)
+++ ruby_1_9_1/ext/ripper/extconf.rb	(revision 21161)
@@ -11,7 +11,7 @@
     end
   end
   $objs = %w(ripper.o)
-  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
+  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c)
   $defs << '-DRIPPER'
   $defs << '-DRIPPER_DEBUG' if $debug
   $VPATH << '$(topdir)' << '$(top_srcdir)'

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