File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed
Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change 3434rubylibdir = config [ "rubylibdir" ]
3535rubyarchdir = config [ "rubyarchdir" ]
3636archdir = "#{ 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 )
4043end
Original file line number Diff line number Diff line change @@ -367,11 +367,7 @@ def CONFIG.[](name, mandatory = false)
367367
368368bindir = CONFIG [ "bindir" , true ]
369369if 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" ] + "/" }
375371end
376372libdir = CONFIG [ CONFIG . fetch ( "libdirname" , "libdir" ) , true ]
377373rubyhdrdir = CONFIG [ "rubyhdrdir" , true ]
You can’t perform that action at this time.
0 commit comments