From 1587b32480b8ff607f0a56626a6fbdc068a62a20 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Sep 2015 12:29:29 +0000
Subject: fake.rb: optimal paths

* tool/fake.rb: remove redundant dot directories from joined path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/fake.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tool/fake.rb')

diff --git a/tool/fake.rb b/tool/fake.rb
index 298c2043a7..b2bdd086c4 100644
--- a/tool/fake.rb
+++ b/tool/fake.rb
@@ -44,8 +44,9 @@ prehook = proc do |extmk|
     builddir = File.join([".."]*pwd.size + dir)
     builddir = "." if builddir.empty?
   end
+  join = proc {|*args| File.join(*args).sub!(/\A(?:\.\/)*/, '')}
   $topdir ||= builddir
-  $top_srcdir ||= File.join($topdir, srcdir)
+  $top_srcdir ||= join[$topdir, srcdir]
   $extout = '$(topdir)/.ext'
   $extout_prefix = '$(extout)$(target_prefix)/'
   config = RbConfig::CONFIG
@@ -53,8 +54,8 @@ prehook = proc do |extmk|
   mkconfig["builddir"] = config["builddir"] = builddir
   mkconfig["top_srcdir"] = $top_srcdir if $top_srcdir
   config["top_srcdir"] = File.expand_path($top_srcdir ||= top_srcdir)
-  config["rubyhdrdir"] = File.join($top_srcdir, "include")
-  config["rubyarchhdrdir"] = File.join(builddir, config["EXTOUT"], "include", config["arch"])
+  config["rubyhdrdir"] = join[$top_srcdir, "include"]
+  config["rubyarchhdrdir"] = join[builddir, config["EXTOUT"], "include", config["arch"]]
   mkconfig["libdirname"] = "builddir"
   trace_var(:$ruby, posthook)
   untrace_var(:$extmk, prehook)
-- 
cgit v1.2.3