diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-25 17:20:05 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-25 17:20:05 +0000 |
commit | 274ebddacbd9694e9d062e3e2a06bcec17ceb4b4 (patch) | |
tree | ec451376d654277f1e707052cbf6340542651daa | |
parent | 1363dcd03b3c9d963f5170e0ee7b6d11534abf14 (diff) | |
download | ruby-274ebddacbd9694e9d062e3e2a06bcec17ceb4b4.tar.gz ruby-274ebddacbd9694e9d062e3e2a06bcec17ceb4b4.tar.xz ruby-274ebddacbd9694e9d062e3e2a06bcec17ceb4b4.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@19939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rwxr-xr-x | instruby.rb | 2 | ||||
-rwxr-xr-x | tool/mdoc2man.rb | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -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 c9958ee48..dfa495bee 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 634e86d06..3c83dc3dc 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 910b2e574..0922474b4 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 = [] |