From 438fb66969ccecfbfe838c6a4a3a4ad3d7be1db0 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Fri, 3 Oct 2014 14:27:31 +0000 Subject: [PATCH] fake.rb.in: fix make install failure * template/fake.rb.in: fix make install failure due to MSYS path with mingw on MSYS environment. [ruby-core:64965] [Bug #10230] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ template/fake.rb.in | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 718259e4d9..5302203d34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 3 23:22:23 2014 Hiroshi Shirosaki + + * template/fake.rb.in: fix make install failure due to MSYS path + with mingw on MSYS environment. + [ruby-core:64965] [Bug #10230] + Fri Oct 3 21:02:32 2014 SHIBATA Hiroshi * test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop. diff --git a/template/fake.rb.in b/template/fake.rb.in index 8b4e6e5aa3..6f5de5092f 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -19,6 +19,10 @@ class Object end builddir = File.dirname(__FILE__) top_srcdir = "@abs_top_srcdir@" +if /mingw/ =~ RUBY_PLATFORM + # convert MSYS path to Windows path + top_srcdir.sub!(/\A\/([a-z])\//, '\\1:/') +end $:.unshift(File.expand_path(builddir)) fake = File.join(top_srcdir, "tool/fake.rb") eval(File.read(fake), nil, fake)