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 | 5660e09f08362a4146b285ca50225348d1213633 (patch) | |
| tree | 8da9c91dde792b2d70195ec69ab5018e9cc2fc96 /instruby.rb | |
| parent | f7d4df50c004d775a296b8989bb3ac792db6e639 (diff) | |
| download | bundler-5660e09f08362a4146b285ca50225348d1213633.tar.gz | |
* 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
Diffstat (limited to 'instruby.rb')
| -rwxr-xr-x | instruby.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/instruby.rb b/instruby.rb index c7ffe8d04d..02b74c4ebe 100755 --- a/instruby.rb +++ b/instruby.rb @@ -2,6 +2,7 @@ load "./rbconfig.rb" include RbConfig +$".unshift File.expand_path("./rbconfig.rb") srcdir = File.dirname(__FILE__) $:.unshift File.expand_path("lib", srcdir) @@ -10,6 +11,7 @@ require 'shellwords' require 'optparse' require 'optparse/shellwords' require 'tempfile' +require 'rdoc/ri/paths' STDOUT.sync = true File.umask(0) @@ -280,7 +282,7 @@ install?(:rdoc) do if $rdocdir puts "installing rdoc" - ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system') + ridatadir = RDoc::RI::Paths::SYSDIR Config.expand(ridatadir) makedirs [ridatadir] install_recursive($rdocdir, ridatadir, :mode => $data_mode) |