Skip to content

Commit 379bbd6

Browse files
committed
[Bug #20800] Move executable binary file path
From under "libexec", under `$(target)/bin` like as binutils.
1 parent 303a52c commit 379bbd6

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

tool/mkrunnable.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
rubylibdir = config["rubylibdir"]
3535
rubyarchdir = config["rubyarchdir"]
3636
archdir = "#{extout}/#{arch}"
37-
exedir = libdirname == "archlibdir" ? "#{config["libexecdir"]}/#{arch}" : bindir
37+
exedir = bindir
38+
if libdirname == "archlibdir"
39+
exedir = exedir.sub(%r[/\K(?=[^/]+\z)]) {extout+"/"}
40+
end
3841
[exedir, libdir, archdir].uniq.each do |dir|
3942
File.directory?(dir) or mkdir_p(dir)
4043
end

tool/rbinstall.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,11 +367,7 @@ def CONFIG.[](name, mandatory = false)
367367

368368
bindir = CONFIG["bindir", true]
369369
if CONFIG["libdirname"] == "archlibdir"
370-
libexecdir = MAKEFILE_CONFIG["archlibdir"].dup
371-
unless libexecdir.sub!(/\$\(lib\K(?=dir\))/) {"exec"}
372-
libexecdir = "$(libexecdir)/$(arch)"
373-
end
374-
archbindir = RbConfig.expand(libexecdir)
370+
archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["target"] + "/"}
375371
end
376372
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
377373
rubyhdrdir = CONFIG["rubyhdrdir", true]

0 commit comments

Comments
 (0)