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

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f7fc02bfa3..8005f45792 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  8 17:32:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: should not depend on a library which does not exist
+	  in 1.8.
+
 Wed Jan  7 22:13:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (man, gem): fixed errors.
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