From 1fcf3b06b9880e3d21920c70ba53cb10b7e37547 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 26 Mar 2009 02:33:16 +0000
Subject: * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers  
 --program-prefix and --program-suffix.  reapplied r19923.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/ri/paths.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index fcafb279f..11bbf4573 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -28,10 +28,17 @@ module RDoc::RI::Paths
 
   VERSION = RbConfig::CONFIG['ruby_version']
 
-  base    = File.join(RbConfig::CONFIG['datadir'], "ri", VERSION)
+  if m = /ruby/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+    m = [m.pre_match, m.post_match]
+  else
+    m = [""] * 2
+  end
+  ri = "#{m[0]}ri#{m[1]}"
+  rdoc = "#{m[0]}rdoc#{m[1]}"
+  base    = File.join(RbConfig::CONFIG['datadir'], ri, VERSION)
   SYSDIR  = File.join(base, "system")
   SITEDIR = File.join(base, "site")
-  HOMEDIR = (File.expand_path("~/.rdoc") rescue nil)
+  HOMEDIR = (File.expand_path("~/.#{rdoc}") rescue nil)
 
   begin
     require 'rubygems' unless defined?(Gem) and defined?(Gem::Enable) and
-- 
cgit