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