From fd5dcfec379f115e0d9249d5ec9460c2a94882b4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Jan 2009 08:32:17 +0000
Subject: * instruby.rb: should not depend on a library which does not exist  
 in 1.8.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  5 +++++
 instruby.rb | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e2200198..a64dead06 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.
+
 Thu Jan  8 07:52:55 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c (init_unix_addrinfo): don't return a value.
diff --git a/instruby.rb b/instruby.rb
index 4edfe6e03..1dc1a847d 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -284,8 +284,7 @@ install?(:doc, :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
@@ -342,10 +341,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
@@ -411,7 +410,11 @@ end
 install?(:local, :comm, :gem) do
   puts "creating default gem directories"
 
-  directories = %w[cache doc gems specifications]
+  directories = open(File.join(srcdir, "lib/rubygems.rb")) do |f|
+    if f.grep(/^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/)
+      break $1.split
+    end
+  end
   gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
   makedirs directories.collect {|dir| File.join(gpath, dir)}
 end
-- 
cgit