diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-22 09:49:56 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-22 09:49:56 +0000 |
commit | c31da4fc5f53cd082d5da68c69fe3e8be7d29bac (patch) | |
tree | 81ba70e78345d4fa0c294472b36673ff44e26ed3 | |
parent | c30a6322d6ae4cf8297e69abab5dc162e7e910a7 (diff) |
* instruby.rb (rdoc): considers --program-prefix and --program-suffix
for the path to ri documents.
fixes [ruby-core:23519]. c.f. [ruby-dev:38255].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | instruby.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri May 22 18:44:34 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * instruby.rb (rdoc): considers --program-prefix and --program-suffix + for the path to ri documents. + fixes [ruby-core:23519]. c.f. [ruby-dev:38255]. + Wed May 20 20:54:37 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * spec/.gitignore: ignores rubyspec/ and mspec/. diff --git a/instruby.rb b/instruby.rb index c496d89b04..17dc6a4c95 100755 --- a/instruby.rb +++ b/instruby.rb @@ -283,7 +283,7 @@ install?(:rdoc) do if $rdocdir puts "installing rdoc" - ridatadir = File.join(CONFIG['datadir'], "ri", CONFIG['ruby_version'], "system") + ridatadir = File.join(CONFIG['datadir'], CONFIG['ruby_install_name'].sub('ruby', 'ri'), CONFIG['ruby_version'], "system") makedirs [ridatadir] install_recursive($rdocdir, ridatadir, :mode => $data_mode) end |