diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-05 12:29:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-05 12:29:29 +0000 |
| commit | 89c5e354078c4953f163c88cc6781e65136303f5 (patch) | |
| tree | 7ac159f2ceaaf0174eede9ff1533425df65933f1 /tool/fake.rb | |
| parent | ca109301642366c43b1cdb4d8a3389202b9e60b0 (diff) | |
| download | ruby-89c5e354078c4953f163c88cc6781e65136303f5.tar.gz | |
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
Diffstat (limited to 'tool/fake.rb')
| -rw-r--r-- | tool/fake.rb | 7 |
1 files changed, 4 insertions, 3 deletions
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) |