rubygems-1.3.1-setup.patch 1.5 KB
Newer Older
Carlo Lanmdeter's avatar
Carlo Lanmdeter committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
--- setup.rb.~1~	2008-06-22 01:51:11.000000000 +0200
+++ setup.rb	2008-06-28 09:05:54.923666929 +0200
@@ -128,8 +128,8 @@
     lib_dir = Gem::ConfigMap[site_or_vendor]
     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[site_or_vendor]
+    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
   end
 end
 
@@ -240,19 +240,6 @@
   end
 end
 
-# Remove source caches
-if install_destdir.empty?
-  require 'rubygems/source_info_cache'
-
-  user_cache_file = File.join(install_destdir,
-                              Gem::SourceInfoCache.user_cache_file)
-  system_cache_file = File.join(install_destdir,
-                                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)
-end
-
 # install RDoc
 
 gem_doc_dir = File.join Gem.dir, 'doc'
@@ -262,10 +249,6 @@
 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)
     begin
@@ -277,7 +260,7 @@
 
     args << '--quiet'
     args << '--main' << 'README'
-    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
+    args << '.' << 'README'
 
     r = RDoc::RDoc.new
     r.document args