* configure.in ($MANTYPE): followed ruby.1, which had moved.

* instruby.rb (:man): ditto.

* mdoc2man.rb: fixed for the case Xr with 2 arguments.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Sun Oct 26 02:16:29 2008  Yuki Sonoda (Yugui)   <yugui@yugui.jp>
+
+	* configure.in ($MANTYPE): followed ruby.1, which had moved.
+
+	* instruby.rb (:man): ditto.
+
+	* mdoc2man.rb: fixed for the case Xr with 2 arguments.
+
 Sun Oct 26 01:42:45 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* man/irb.1: new manual page.

configure.in

@@ -2086,7 +2086,7 @@ AC_ARG_WITH(mantype,
 		])
 if test -z "$MANTYPE"; then
 	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
+	if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
 		MANTYPE=doc
 	else
 		MANTYPE=man

instruby.rb

@@ -386,7 +386,7 @@ install?(:local, :comm, :man) do
     if $mantype == "doc"
       install mdoc, destfile, :mode => $data_mode
     else
-      require 'tool/mdoc2man.rb'
+      require "../tool/mdoc2man.rb"
 
       w = Tempfile.open(mdoc)
 

tool/mdoc2man.rb

@@ -190,7 +190,7 @@ class Mdoc2Man
 	next
       when 'Xr'
 	retval << '\\fB' << words.shift <<
-	  '\\fP(' << words.shift << ')' << words.shift
+	  '\\fP(' << words.shift << ')' << (words.shift||'')
 	break
       when 'Rs'
 	@refauthors = []