aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 18:08:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 18:08:02 +0000
commit8212ca438dde1b8fb4004e38fe5827c15725571b (patch)
tree0f1db59ec443885fb9045012d2808b4503895b17
parent370ffc6a2a098ba9e545cfad90013fd7e0b0f8a7 (diff)
downloadruby-8212ca438dde1b8fb4004e38fe5827c15725571b.tar.gz
* instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xinstruby.rb3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ed8285cfa..d2b501d6a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 13 03:07:28 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
+
Tue Jan 13 02:54:54 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
diff --git a/instruby.rb b/instruby.rb
index bf6840ca26..6cfa3c572f 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -430,6 +430,7 @@ install?(:local, :comm, :man) do
puts "installing manpages"
has_goruby = File.exist?(goruby_install_name+exeext)
+ require File.join(srcdir, "tool/mdoc2man.rb") if $mantype != "doc"
Dir.chdir("#{srcdir}/man")
for mdoc in Dir["*.[1-9]"]
next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
@@ -447,8 +448,6 @@ install?(:local, :comm, :man) do
if $mantype == "doc"
install mdoc, destfile, :mode => $data_mode
else
- require File.join(srcdir, "tool/mdoc2man.rb")
-
w = nil
Tempfile.open(mdoc) do |f|
w = f