merge revision(s) 22489:

	* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
	  rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0adff48046..ac534314b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 21:24:01 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
+	  rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]
+
 Tue May 26 21:21:49 2009  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
diff --git a/Makefile.in b/Makefile.in
index a37bcf65fb..9eaab0be4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,14 +189,14 @@ update-rubyspec:
 	if [ -d $(srcdir)/rubyspec ]; then \
 	  cd $(srcdir)/rubyspec/mspec; \
 	  git pull; \
-	  cd ../spec/rubyspec; \
+	  cd ../spec; \
 	  git pull; \
 	else \
+	  mkdir $(srcdir)/rubyspec; \
 	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
+	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec; \
 	fi
 
 test-rubyspec:
 	@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)
-
+	RUBY_EXE="$(RUNRUBY)" $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec-run --background --prefix $(srcdir)/rubyspec/spec -B $(srcdir)/rubyspec/spec/ruby.$(MAJOR).$(MINOR).mspec
diff --git a/version.h b/version.h
index 1629602d8c..51674256f6 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-05-26"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090526
-#define RUBY_PATCHLEVEL 166
+#define RUBY_PATCHLEVEL 167
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8