From e297c26dcae985299075acacfe8e25c93feb82ad Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 29 Dec 2008 07:19:41 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ Makefile.in | 6 +++++- ext/ripper/extconf.rb | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7af2b6d241..b997d0f099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 29 14:50:19 2008 Yuki Sonoda (Yugui) + + * 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 * thread.c (rb_mutex_trylock): return false if Mutex owned diff --git a/Makefile.in b/Makefile.in index d317412df2..3b8543d781 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,7 +225,11 @@ clean-ext distclean-ext realclean-ext:: 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) diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb index a41a6af2d8..4914d70e78 100644 --- a/ext/ripper/extconf.rb +++ b/ext/ripper/extconf.rb @@ -11,7 +11,7 @@ def main 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)' -- cgit v1.2.3