summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rwxr-xr-xinstruby.rb2
-rwxr-xr-xtool/mdoc2man.rb2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a4268f311..bd8a975d55 100644
--- a/ChangeLog
+++ b/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.
diff --git a/configure.in b/configure.in
index c9958ee489..dfa495bee6 100644
--- a/configure.in
+++ b/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
diff --git a/instruby.rb b/instruby.rb
index 634e86d069..3c83dc3dc1 100755
--- a/instruby.rb
+++ b/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)
diff --git a/tool/mdoc2man.rb b/tool/mdoc2man.rb
index 910b2e5745..0922474b47 100755
--- a/tool/mdoc2man.rb
+++ b/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 = []