diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-24 14:05:49 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-24 14:05:49 +0000 |
| commit | 835df676017fe476e2d525740a9ad34f2e94d9c1 (patch) | |
| tree | 8da9c91dde792b2d70195ec69ab5018e9cc2fc96 /lib | |
| parent | 676c9a7eb4a3736c61142ba52e7c9d92cb49b89a (diff) | |
| download | ruby-835df676017fe476e2d525740a9ad34f2e94d9c1.tar.gz ruby-835df676017fe476e2d525740a9ad34f2e94d9c1.tar.xz ruby-835df676017fe476e2d525740a9ad34f2e94d9c1.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@19923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/ri/paths.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index 2f72b9dfd..037606ec2 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 |