rename ruby-runner as bin/ruby

* Makefile.in, configure.in, tool/runruby.rb: rename ruby-runner
  executable file as $(RUBY_INSTALL_NAME) under bin, to mimic
  dirty `#!/usr/bin/env` hack.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 4 deletions

diff --git a/tool/mkrunnable.rb b/tool/mkrunnable.rb
index fbfc76047a..e43c4329e7 100755
--- a/tool/mkrunnable.rb
+++ b/tool/mkrunnable.rb
@@ -115,8 +115,8 @@ rubyw_install_name = config["rubyw_install_name"]
 goruby_install_name = "go" + ruby_install_name
 [ruby_install_name, rubyw_install_name, goruby_install_name].map do |ruby|
   ruby += exeext
-  if ruby and !ruby.empty?
-    ln_relative(ruby, "#{bindir}/#{ruby}")
+  if ruby and !ruby.empty? and !File.file?(target = "#{bindir}/#{ruby}")
+    ln_relative(ruby, target)
   end
 end
 so = config["LIBRUBY_SO"]
diff --git a/tool/runruby.rb b/tool/runruby.rb
index be1be6a68b..23d835536e 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -74,14 +74,14 @@ env = {
   'RUBY_FIBER_MACHINE_STACK_SIZE' => '1',
 }
 
-runner = File.join(abs_archdir, "ruby-runner#{config['EXEEXT']}")
+runner = File.join(abs_archdir, "bin/ruby#{config['EXEEXT']}")
 runner = nil unless File.exist?(runner)
 abs_ruby = runner || File.expand_path(ruby)
 env["RUBY"] = abs_ruby
 env["GEM_PATH"] = env["GEM_HOME"] = File.expand_path("spec/rspec", srcdir)
 env["BUNDLE_RUBY"] = abs_ruby
 env["BUNDLE_GEM"] = "#{abs_ruby} -rrubygems #{srcdir}/bin/gem --backtrace"
-env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
+env["PATH"] = [File.dirname(abs_ruby), abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
 
 if e = ENV["RUBYLIB"]
   libs |= e.split(File::PATH_SEPARATOR)