yugui	2009-01-12 22:31:49 +0900 (Mon, 12 Jan 2009)

  New Revision: 21454

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21454

  Log:
    merges r21387 from trunk into ruby_1_9_1.
    * instruby.rb: should not depend on a library which does not exist
      in 1.8.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/instruby.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21453)
+++ ruby_1_9_1/ChangeLog	(revision 21454)
@@ -1,3 +1,8 @@
+Thu Jan  8 17:32:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* instruby.rb (man, gem): fixed errors.
Index: ruby_1_9_1/instruby.rb
===================================================================
--- ruby_1_9_1/instruby.rb	(revision 21453)
+++ ruby_1_9_1/instruby.rb	(revision 21454)
@@ -283,8 +283,7 @@
   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 @@
 :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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/