From 2a191a1470a1c8cbff3625484d4af515e8d6f0bc Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 1 Jan 2009 06:42:51 +0000 Subject: merges r21212 from trunk into ruby_1_9_1. * spec/README: follows the change of directory structure in rubyspec. * spec/default.mspec: ditto. Also follows change of mspec command. * Makefile.in: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3b8543d78..2aa9befef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -236,20 +236,24 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c update-rubyspec: - if [ -d $(srcdir)/spec/mspec ]; then \ + @if [ -d $(srcdir)/spec/mspec ]; then \ cd $(srcdir)/spec/mspec; \ + echo updating mspec ...; \ git pull; \ cd ../..; \ else \ + echo retrieving mspec ...; \ git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \ fi - if [ -d $(srcdir)/spec/rubyspec ]; then \ + @if [ -d $(srcdir)/spec/rubyspec ]; then \ cd $(srcdir)/spec/rubyspec; \ + echo updating rubyspec ...; \ git pull; \ else \ + echo retrieving rubyspec ...; \ git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \ fi test-rubyspec: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(srcdir)/spec/rubyspec/$(MAJOR).$(MINOR) + $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(MSPECOPT) -- cgit