mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
--program-prefix and --program-suffix. reapplied r19923. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
340d9c59fd
commit
e0b7af69b4
2 changed files with 14 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Mar 26 11:33:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
|
||||||
|
--program-prefix and --program-suffix. reapplied r19923.
|
||||||
|
|
||||||
Wed Mar 25 07:45:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Wed Mar 25 07:45:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* configure.in (target_alias): replaces cpu with universal too.
|
* configure.in (target_alias): replaces cpu with universal too.
|
||||||
|
|
|
@ -28,10 +28,17 @@ module RDoc::RI::Paths
|
||||||
|
|
||||||
VERSION = RbConfig::CONFIG['ruby_version']
|
VERSION = RbConfig::CONFIG['ruby_version']
|
||||||
|
|
||||||
base = File.join(RbConfig::CONFIG['datadir'], "ri", VERSION)
|
if m = /ruby/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
|
||||||
|
m = [m.pre_match, m.post_match]
|
||||||
|
else
|
||||||
|
m = [""] * 2
|
||||||
|
end
|
||||||
|
ri = "#{m[0]}ri#{m[1]}"
|
||||||
|
rdoc = "#{m[0]}rdoc#{m[1]}"
|
||||||
|
base = File.join(RbConfig::CONFIG['datadir'], ri, VERSION)
|
||||||
SYSDIR = File.join(base, "system")
|
SYSDIR = File.join(base, "system")
|
||||||
SITEDIR = File.join(base, "site")
|
SITEDIR = File.join(base, "site")
|
||||||
HOMEDIR = (File.expand_path("~/.rdoc") rescue nil)
|
HOMEDIR = (File.expand_path("~/.#{rdoc}") rescue nil)
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require 'rubygems' unless defined?(Gem) and defined?(Gem::Enable) and
|
require 'rubygems' unless defined?(Gem) and defined?(Gem::Enable) and
|
||||||
|
|
Loading…
Reference in a new issue