aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--template/fake.rb.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a2f7aa75f4..9df9c3f72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 26 13:46:33 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * template/fake.rb.in: fix failed to make install when srcdir !=
+ builddir.
+
Tue Aug 26 13:43:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_range.rb: added workaround for VERBOSE message.
diff --git a/template/fake.rb.in b/template/fake.rb.in
index e4683353ee..0b454f1e3e 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -18,7 +18,7 @@ class Object
RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
end
builddir = File.dirname(__FILE__)
-top_srcdir = File.join(builddir, "@srcdir@")
+top_srcdir = File.expand_path("@srcdir@", builddir)
$:.unshift(File.expand_path(builddir))
fake = File.join(top_srcdir, "tool/fake.rb")
eval(File.read(fake), nil, fake)