diff options
author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-03 14:27:31 +0000 |
---|---|---|
committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-03 14:27:31 +0000 |
commit | 438fb66969ccecfbfe838c6a4a3a4ad3d7be1db0 (patch) | |
tree | 288febf789f02e42a6e24b347053e910f9c86ab8 | |
parent | 5207d9f158485d6f4b96477b4d08c15eaded93c4 (diff) | |
download | ruby-438fb66969ccecfbfe838c6a4a3a4ad3d7be1db0.tar.gz |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | template/fake.rb.in | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Oct 3 23:22:23 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * 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 <shibata.hiroshi@gmail.com> * 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) |