@@ -189,9 +189,6 @@ def prepare_installation
189189 opts . parse!
190190 end
191191
192- version = [ RbConfig ::CONFIG [ "MAJOR" ] , RbConfig ::CONFIG [ "MINOR" ] ] . join ( "." )
193- libdir = File . join ( RbConfig ::CONFIG [ "libdir" ] , "ruby" , version )
194-
195192 # Mac OS X 10.5 and higher declare bindir
196193 # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
197194 # which is not generally where people expect executables to be installed
@@ -278,7 +275,8 @@ def prepare_installation
278275 if sitelibdir . nil?
279276 sitelibdir = $LOAD_PATH. find { |x | x =~ /site_ruby/ }
280277 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" )
282280 elsif sitelibdir !~ Regexp . quote ( version )
283281 sitelibdir = File . join ( sitelibdir , version )
284282 end
@@ -324,7 +322,6 @@ def prepare_installation
324322 InstallOptions . codedir = codedir
325323 InstallOptions . config_dir = configdir
326324 InstallOptions . bin_dir = bindir
327- InstallOptions . lib_dir = libdir
328325 InstallOptions . man_dir = mandir
329326 InstallOptions . var_dir = vardir
330327 InstallOptions . public_dir = publicdir
0 commit comments