summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-02 04:57:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-02 04:57:16 +0000
commit6a08bd96240b09a7625736e48c6ea4c68dd34b3c (patch)
tree8e3a7a01078a4cf26fb5ed7a50ea06e94bf814c0
parent6926a10297982f09312b4da3a3bb14f28e877978 (diff)
* lib/rdoc/ri/paths.rb: follows $ridir. reapplied r23554.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rdoc/ri/paths.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b5ea20a5cf..e20c185366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Apr 2 13:51:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 2 13:57:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/ri/paths.rb: follows $ridir. reapplied r23554.
* lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): expand_path deals with
platform dependent envirionments. reapplied r21312.
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index 7090a58d44..f2d65d9ce0 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -10,7 +10,7 @@ module RDoc::RI::Paths
version = RbConfig::CONFIG['ruby_version']
- base = File.join RbConfig::CONFIG['datadir'], "ri", version
+ base = File.join RbConfig::CONFIG['ridir'], version
SYSDIR = File.join base, "system"
SITEDIR = File.join base, "site"
HOMEDIR = (File.expand_path("~/.rdoc") rescue nil)