@@ -193,9 +193,6 @@ def prepare_installation
193
193
opts . parse!
194
194
end
195
195
196
- version = [ RbConfig ::CONFIG [ "MAJOR" ] , RbConfig ::CONFIG [ "MINOR" ] ] . join ( "." )
197
- libdir = File . join ( RbConfig ::CONFIG [ "libdir" ] , "ruby" , version )
198
-
199
196
# Mac OS X 10.5 and higher declare bindir
200
197
# /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
201
198
# which is not generally where people expect executables to be installed
@@ -282,7 +279,8 @@ def prepare_installation
282
279
if sitelibdir . nil?
283
280
sitelibdir = $LOAD_PATH. find { |x | x =~ /site_ruby/ }
284
281
if sitelibdir . nil?
285
- sitelibdir = File . join ( libdir , "site_ruby" )
282
+ version = [ RbConfig ::CONFIG [ "MAJOR" ] , RbConfig ::CONFIG [ "MINOR" ] ] . join ( "." )
283
+ sitelibdir = File . join ( RbConfig ::CONFIG [ "libdir" ] , "ruby" , version , "site_ruby" )
286
284
elsif sitelibdir !~ Regexp . quote ( version )
287
285
sitelibdir = File . join ( sitelibdir , version )
288
286
end
@@ -328,7 +326,6 @@ def prepare_installation
328
326
InstallOptions . codedir = codedir
329
327
InstallOptions . config_dir = configdir
330
328
InstallOptions . bin_dir = bindir
331
- InstallOptions . lib_dir = libdir
332
329
InstallOptions . man_dir = mandir
333
330
InstallOptions . var_dir = vardir
334
331
InstallOptions . public_dir = publicdir
0 commit comments