summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-16 05:55:53 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-16 05:55:53 +0000
commit36581da692c6b8687a4b4ecb26ce0e9bdbec3dfd (patch)
treef1e2b6ecee4a2286f4121deeec53ee76382608e7
parent4d0fd56540c8b51c2342d22556bf7fc947024077 (diff)
* Makefile.in (update-rubyspec): move rubyspec to srcdir.
(test-rubyspec): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bbffb3f51..10660d8550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 16 14:54:56 2008 Tanaka Akira <akr@fsij.org>
+
+ * Makefile.in (update-rubyspec): move rubyspec to srcdir.
+ (test-rubyspec): ditto.
+
Fri May 16 14:25:22 2008 Tanaka Akira <akr@fsij.org>
* Makefile.in (test-rubyspec): use RUNRUBY. suggested by nobu.
diff --git a/Makefile.in b/Makefile.in
index a0af4c8744..e21785deca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,17 +186,17 @@ MSPEC_GIT_URL=git://github.com/brixen/mspec.git
RUBYSPEC_GIT_URL=git://github.com/brixen/rubyspec.git
update-rubyspec:
- if [ -d rubyspec ]; then \
- cd rubyspec/mspec; \
+ if [ -d $(srcdir)/rubyspec ]; then \
+ cd $(srcdir)/rubyspec/mspec; \
git pull; \
cd ../spec/rubyspec; \
git pull; \
else \
- git clone $(MSPEC_GIT_URL) rubyspec/mspec; \
- git clone $(RUBYSPEC_GIT_URL) rubyspec/spec/rubyspec; \
+ git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
+ git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
fi
test-rubyspec:
- @if [ ! -d rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
- $(RUNRUBY) rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+ @if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
+ $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)