@@ -193,9 +193,6 @@ def prepare_installation
193193 opts . parse!
194194 end
195195
196- version = [ RbConfig ::CONFIG [ "MAJOR" ] , RbConfig ::CONFIG [ "MINOR" ] ] . join ( "." )
197- libdir = File . join ( RbConfig ::CONFIG [ "libdir" ] , "ruby" , version )
198-
199196 # Mac OS X 10.5 and higher declare bindir
200197 # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
201198 # which is not generally where people expect executables to be installed
@@ -282,7 +279,8 @@ def prepare_installation
282279 if sitelibdir . nil?
283280 sitelibdir = $LOAD_PATH. find { |x | x =~ /site_ruby/ }
284281 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" )
286284 elsif sitelibdir !~ Regexp . quote ( version )
287285 sitelibdir = File . join ( sitelibdir , version )
288286 end
@@ -328,7 +326,6 @@ def prepare_installation
328326 InstallOptions . codedir = codedir
329327 InstallOptions . config_dir = configdir
330328 InstallOptions . bin_dir = bindir
331- InstallOptions . lib_dir = libdir
332329 InstallOptions . man_dir = mandir
333330 InstallOptions . var_dir = vardir
334331 InstallOptions . public_dir = publicdir
0 commit comments