Revert r35370 due to bad source branch

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 13 deletions

diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index 0c957393d9..52a3b88fe3 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -252,19 +252,9 @@ TEXT
   end
 
   def make_destination_dirs(install_destdir)
-    lib_dir, bin_dir = Gem.default_rubygems_dirs
+    lib_dir = nil
+    bin_dir = nil
 
-    unless lib_dir
-      lib_dir, bin_dir = generate_default_dirs(install_destdir)
-    end
-
-    mkdir_p lib_dir
-    mkdir_p bin_dir
-
-    return lib_dir, bin_dir
-  end
-
-  def generate_default_dirs(install_destdir)
     prefix = options[:prefix]
     site_or_vendor = options[:site_or_vendor]
 
@@ -293,7 +283,10 @@ TEXT
       bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
     end
 
-    [lib_dir, bin_dir]
+    mkdir_p lib_dir
+    mkdir_p bin_dir
+
+    return lib_dir, bin_dir
   end
 
   def remove_old_bin_files(bin_dir)