diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-08 08:40:16 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-08 08:40:16 +0000 |
commit | 19f624541fd99231689880e11d5be25d51ef3c6b (patch) | |
tree | f8f3ceff513e26a2254f618febd8eb7d6cba717b | |
parent | 5fac45dc3035a3b2930e0938d4e3e3f10b81e7a5 (diff) |
rbinstall.rb: gem bindir
* tool/rbinstall.rb (gem): use the bindir of each gemspec instead
of hardcoded 'bin', since rdoc 5.0.0 overrides it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Sep 8 17:40:15 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/rbinstall.rb (gem): use the bindir of each gemspec instead + of hardcoded 'bin', since rdoc 5.0.0 overrides it. + Thu Sep 8 16:47:03 2016 Shugo Maeda <shugo@ruby-lang.org> * eval.c (rb_mod_s_used_modules): rename Module.used_refinements to diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index ab61a0256e..a012d840f5 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -727,7 +727,7 @@ install?(:ext, :comm, :gem) do end unless gemspec.executables.empty? then - bin_dir = File.join(gem_dir, 'gems', full_name, 'bin') + bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir) makedirs(bin_dir) execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} |