View | Details | Raw Unified
Collapse All | Expand All

(-) setup.rb.orig (-21 / +3 lines)
 Lines 128-135   else Link Here  
    lib_dir = Gem::ConfigMap[site_or_vendor]
    lib_dir = Gem::ConfigMap[site_or_vendor]
    bin_dir = Gem::ConfigMap[:bindir]
    bin_dir = Gem::ConfigMap[:bindir]
  else
  else
    lib_dir = File.join prefix, 'lib'
 
    lib_dir = File.join prefix, Gem::ConfigMap[:sitelibdir]
 
    bin_dir = File.join prefix, 'bin'
 
    bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
 
  end
  end
end
end

  

    

    

       Lines 240-258
      abort "#{deprecation_message}" 
    
  Link Here 
    

  

        
  end
  end

        
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
# install RDoc

        

        
gem_doc_dir = File.join Gem.dir, 'doc'
gem_doc_dir = File.join Gem.dir, 'doc'

  

    

    

       Lines 262-271
      rubygems_doc_dir = File.join gem_doc_dir 
    
  Link Here 
    

  

        
if File.writable? gem_doc_dir and
if File.writable? gem_doc_dir and

        
   (not File.exist? rubygems_doc_dir or
   (not File.exist? rubygems_doc_dir or

        
    File.writable? rubygems_doc_dir) then
    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)
  def run_rdoc(*args)

        
    begin
    begin

  

    

    

       Lines 277-283
      if File.writable? gem_doc_dir and 
    
  Link Here 
    

  

        

        
    args << '--quiet'
    args << '--quiet'

        
    args << '--main' << 'README'
    args << '--main' << 'README'

            

              
    args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'

              
    args << '.' << 'README'

            

        

        
    r = RDoc::RDoc.new
    r = RDoc::RDoc.new

        
    r.document args
    r.document args

  

    

    

       Lines 323-326
      puts 
    
  Link Here 
    

  

        
puts "If `gem` was installed by a previous RubyGems installation, you may need"
puts "If `gem` was installed by a previous RubyGems installation, you may need"

        
puts "to remove it by hand."
puts "to remove it by hand."

        
puts
puts