--- setup.rb.orig	2008-04-11 07:18:01.000000000 +0100
+++ setup.rb	2008-04-11 07:14:53.000000000 +0100
@@ -94,8 +94,8 @@
     lib_dir = Gem::ConfigMap[:sitelibdir]
     bin_dir = Gem::ConfigMap[:bindir]
   else
-    lib_dir = File.join prefix, 'lib'
-    bin_dir = File.join prefix, 'bin'
+    lib_dir = File.join prefix, Gem::ConfigMap[:sitelibdir]
+    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
 
     mkdir_p lib_dir
     mkdir_p bin_dir
@@ -201,16 +201,6 @@
   end
 end
 
-# Remove source caches
-
-require 'rubygems/source_info_cache'
-
-user_cache_file = Gem::SourceInfoCache.user_cache_file
-system_cache_file = Gem::SourceInfoCache.system_cache_file
-
-rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
-rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
-
 # install RDoc
 
 gem_doc_dir = File.join Gem.dir, 'doc'
@@ -220,15 +210,11 @@
 if File.writable? gem_doc_dir and
    (not File.exist? rubygems_doc_dir or
     File.writable? rubygems_doc_dir) then
-  puts "Removing old RubyGems RDoc and ri"
-  Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
-    rm_rf dir
-  end
 
   def run_rdoc(*args)
     args << '--quiet'
     args << '--main' << 'README'
-    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
+    args << '.' << 'README'
 
     r = RDoc::RDoc.new
     r.document args
@@ -251,6 +237,7 @@
 end
 
 # Remove stubs
+if false # Don't want this
 
 def stub?(path)
   return unless File.readable? path
@@ -319,3 +306,4 @@
 puts "to remove it by hand."
 puts
 
+end