summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-07 13:12:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-07 13:12:32 +0000
commite481e0249497b02263b5e56e7bd0013d9383f426 (patch)
tree2b7892a61a09502202b504dc2428ba63f108d9a8
parent13816659c7c962b9d67a18231f1067ac8c52a915 (diff)
downloadruby-e481e0249497b02263b5e56e7bd0013d9383f426.tar.gz
ruby-e481e0249497b02263b5e56e7bd0013d9383f426.tar.xz
ruby-e481e0249497b02263b5e56e7bd0013d9383f426.zip
* instruby.rb (man, gem): fixed errors.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xinstruby.rb7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d7d22e983..1cff55f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 7 22:13:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * instruby.rb (man, gem): fixed errors.
+
Wed Jan 7 17:14:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb: use installed libraries. [ruby-core:21006]
diff --git a/instruby.rb b/instruby.rb
index ff7de147c..4edfe6e03 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -397,7 +397,9 @@ install?(:local, :comm, :man) do
else
require File.join(srcdir, "tool/mdoc2man.rb")
- Tempfile.open(mdoc) do |w|
+ w = nil
+ Tempfile.open(mdoc) do |f|
+ w = f
open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
end
install w.path, destfile, :mode => $data_mode
@@ -409,8 +411,9 @@ end
install?(:local, :comm, :gem) do
puts "creating default gem directories"
+ directories = %w[cache doc gems specifications]
gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
- makedirs Gem::DIRECTORIES.collect {|dir| File.join(gpath, dir)}
+ makedirs directories.collect {|dir| File.join(gpath, dir)}
end
$install << :local << :ext if $install.empty?