diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:31:49 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:31:49 +0000 |
commit | 9cf53eee84a4b44061766e6642b3feb207c2e6c0 (patch) | |
tree | 8202deb5bfa0a46aa99c84759698711227b98c3d /instruby.rb | |
parent | 944de8e86efad1b69ecbb6956d2e5bcdc8af6c48 (diff) |
merges r21387 from trunk into ruby_1_9_1.
* instruby.rb: should not depend on a library which does not exist
in 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'instruby.rb')
-rwxr-xr-x | instruby.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/instruby.rb b/instruby.rb index bf49706a70..4c1d345d4d 100755 --- a/instruby.rb +++ b/instruby.rb @@ -283,8 +283,7 @@ install?(:rdoc) do if $rdocdir puts "installing rdoc" - ridatadir = RDoc::RI::Paths::SYSDIR - Config.expand(ridatadir) + ridatadir = File.join(CONFIG['datadir'], "ri", CONFIG['ruby_version'], "system") makedirs [ridatadir] install_recursive($rdocdir, ridatadir, :mode => $data_mode) end @@ -334,10 +333,10 @@ __END__ :endofruby EOF when "cmd" - "#{<<EOH}#{shebang}#{body}" + "#{<<"/EOH"}#{shebang}#{body}" @"%~dp0#{ruby_install_name}" -x "%~f0" %* @exit /b %ERRORLEVEL% -EOH +/EOH else shebang + body end |