From 8d8d36c15cb2d113a9ff50ba6c3ea0bfabb86eb8 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 1 Jan 2009 13:30:25 +0000
Subject: * spec/default.mspec: fix for builddir != srcdir * Makefile.in:
 ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/default.mspec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'spec/default.mspec')

diff --git a/spec/default.mspec b/spec/default.mspec
index b94807d6d5..50cc6b0920 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,14 +1,17 @@
 load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
 class MSpecScript
-  builddir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  builddir = Dir.pwd
   srcdir = ENV['SRCDIR']
-  srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i]
-  srcdir ||= builddir
+  if !srcdir and File.exist?("#{builddir}/Makefile") then 
+    File.open("#{builddir}/Makefile", "r:US-ASCII") {|f|
+      f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1
+    }
+  end
   config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`}
 
   # The default implementation to run the specs.
   set :target, File.join(builddir, "miniruby#{config['exeext']}")
-  set :prefix, 'spec/rubyspec'
+  set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__))
   set :flags, %W[
     -I#{srcdir}/lib
     -I#{srcdir}/#{config['EXTOUT']}/common
-- 
cgit v1.2.3