diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:48:34 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:48:34 +0000 |
| commit | 379a35b87083b8e66f546824b7634ffd7eee9a94 (patch) | |
| tree | 908e0d4bfa3953ab5a58e2375baa65d4b7a08c8f /tool | |
| parent | d838b0d0436a2a111f30960ecb7deaa5f87693d1 (diff) | |
merge revision(s) 33566:
* tool/rbinstall.rb (install_recursive, bin-comm): split mere
string not path name. [ruby-core:40462] [Bug #5492]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/rbinstall.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index cec8c9f132..8179f9f651 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -239,7 +239,7 @@ def install_recursive(srcdir, dest, options = {}) if dir makedirs(d) else - makedirs(File.dirname(d)) + makedirs(d[/.*(?=\/)/m]) if block_given? yield src, d, opts else @@ -441,7 +441,7 @@ install?(:local, :comm, :bin, :'bin-comm') do trans = proc {|base| base} end install_recursive(File.join(srcdir, "bin"), bindir) do |src, cmd| - cmd = File.join(File.dirname(cmd), RbConfig.expand(trans[File.basename(cmd)])) + cmd = cmd.sub(/[^\/]*\z/m) {|n| RbConfig.expand(trans[n])} shebang = '' body = '' |