diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:42:51 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:42:51 +0000 |
| commit | 2c8756f2c8512e763afea4b63462397a14f09ece (patch) | |
| tree | eabc5f2ab65468cf0538612fbfd0dc8996920f1a /Makefile.in | |
| parent | 8ed6868de020e00cc1d95618bf76eccd3462924f (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 3b8543d781..2aa9befef8 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) |