diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:36:39 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:36:39 +0000 |
| commit | 2c8f90e0863a7fa547aadc1ee8b834859206cbc3 (patch) | |
| tree | 9c16021038658a448ce42cedd54f30ceeaefdef8 | |
| parent | 9f1df8dd6e91afd8acfe7649a53ff331dee40b7f (diff) | |
merges r21477 from trunk into ruby_1_9_1.
* instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | instruby.rb | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -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 4c1d345d4d..40d21ee59a 100755 --- a/instruby.rb +++ b/instruby.rb @@ -369,6 +369,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) == '.'} @@ -386,8 +387,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 |