linamh/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
2008-12-08 19:43:30 +00:00

54 lines
1.5 KiB
Diff

--- 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