summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)