Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 230163 | Differences between
and this patch

Collapse All | Expand All

(-)setup.rb.~1~ (-20 / +3 lines)
Lines 128-135 Link Here
128
    lib_dir = Gem::ConfigMap[site_or_vendor]
128
    lib_dir = Gem::ConfigMap[site_or_vendor]
129
    bin_dir = Gem::ConfigMap[:bindir]
129
    bin_dir = Gem::ConfigMap[:bindir]
130
  else
130
  else
131
    lib_dir = File.join prefix, 'lib'
131
    lib_dir = File.join prefix, Gem::ConfigMap[:sitelibdir]
132
    bin_dir = File.join prefix, 'bin'
132
    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
133
  end
133
  end
134
end
134
end
135
135
Lines 240-258 Link Here
240
  end
240
  end
241
end
241
end
242
242
243
# Remove source caches
244
if install_destdir.empty?
245
  require 'rubygems/source_info_cache'
246
247
  user_cache_file = File.join(install_destdir,
248
                              Gem::SourceInfoCache.user_cache_file)
249
  system_cache_file = File.join(install_destdir,
250
                                Gem::SourceInfoCache.system_cache_file)
251
252
  rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
253
  rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
254
end
255
256
# install RDoc
243
# install RDoc
257
244
258
gem_doc_dir = File.join Gem.dir, 'doc'
245
gem_doc_dir = File.join Gem.dir, 'doc'
Lines 262-271 Link Here
262
if File.writable? gem_doc_dir and
249
if File.writable? gem_doc_dir and
263
   (not File.exist? rubygems_doc_dir or
250
   (not File.exist? rubygems_doc_dir or
264
    File.writable? rubygems_doc_dir) then
251
    File.writable? rubygems_doc_dir) then
265
  puts "Removing old RubyGems RDoc and ri"
266
  Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
267
    rm_rf dir
268
  end
269
252
270
  def run_rdoc(*args)
253
  def run_rdoc(*args)
271
    begin
254
    begin
Lines 277-283 Link Here
277
260
278
    args << '--quiet'
261
    args << '--quiet'
279
    args << '--main' << 'README'
262
    args << '--main' << 'README'
280
    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
263
    args << '.' << 'README'
281
264
282
    r = RDoc::RDoc.new
265
    r = RDoc::RDoc.new
283
    r.document args
266
    r.document args

Return to bug 230163