0002-Disable-versioned-paths-also-for-RI-documentation.patch

Vit Ondruch, 09/12/2011 08:51 PM

Download (1.59 KB)

View differences:

lib/rdoc/ri/paths.rb
11 11
  version = RbConfig::CONFIG['ruby_version']
12 12

  
13 13
  base    = if RbConfig::CONFIG.key? 'ridir' then
14
              File.join RbConfig::CONFIG['ridir'], version
14
              File.join [RbConfig::CONFIG['ridir'], RbConfig::CONFIG['USE_VERSIONED_PATHS'] == 'YES' ? version : nil].compact
15 15
            else
16
              File.join RbConfig::CONFIG['datadir'], 'ri', version
16
              File.join [RbConfig::CONFIG['datadir'], 'ri', RbConfig::CONFIG['USE_VERSIONED_PATHS'] == 'YES' ? version : nil].compact
17 17
            end
18 18

  
19 19
  SYSDIR  = File.join base, "system"
tool/rbinstall.rb
379 379

  
380 380
install?(:doc, :rdoc) do
381 381
  if $rdocdir
382
    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
382
    ridatadir = File.join([CONFIG['ridir'], RbConfig::CONFIG['USE_VERSIONED_PATHS'] == YES ? version : nil, "system"].compact)
383 383
    prepare "rdoc", ridatadir
384 384
    install_recursive($rdocdir, ridatadir, :mode => $data_mode)
385 385
  end
386
-