From 5660e09f08362a4146b285ca50225348d1213633 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 24 Oct 2008 14:05:49 +0000 Subject: * configure.in (sitedir): considers --program-prefix and --program-suffix. (vendordir): ditto. (rubyhdrdir): ditto. * mkconfig.rb (CONFIG["rubylibdir"]): ditto. * win32/Makefile.sub: ditto. * instruby.rb (:rdoc): ditto. * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/ri/paths.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/rdoc/ri') diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index 2f72b9dfd5..037606ec27 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -28,13 +28,15 @@ module RDoc::RI::Paths VERSION = RbConfig::CONFIG['ruby_version'] - base = File.join(RbConfig::CONFIG['datadir'], "ri", VERSION) + ri = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'ri') + base = File.join(RbConfig::CONFIG['datadir'], ri, VERSION) SYSDIR = File.join(base, "system") SITEDIR = File.join(base, "site") homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] if homedir then - HOMEDIR = File.join(homedir, ".rdoc") + rdoc = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'rdoc') + HOMEDIR = File.join(homedir, ".#{rdoc}") else HOMEDIR = nil end -- cgit v1.2.3