yugui	2009-01-16 00:36:39 +0900 (Fri, 16 Jan 2009)

  New Revision: 21544

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

  Log:
    merges r21477 from trunk into ruby_1_9_1.
    * instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.

  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 21543)
+++ ruby_1_9_1/ChangeLog	(revision 21544)
@@ -1,3 +1,7 @@
+Tue Jan 13 03:07:28 2009  NAKAMURA Usaku  <usa@r...>
+
+	* instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
+
 Tue Jan 13 02:54:54 2009  NAKAMURA Usaku  <usa@r...>
 
 	* ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
Index: ruby_1_9_1/instruby.rb
===================================================================
--- ruby_1_9_1/instruby.rb	(revision 21543)
+++ ruby_1_9_1/instruby.rb	(revision 21544)
@@ -369,6 +369,7 @@
   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 @@
     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

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