* Support versions of man that don't use -l.

diff --git a/debian/changelog b/debian/changelog
index 2333ee543b8f5a85e91f794dcbb1e1a3bb5138cf..47a4867ff5a7065a108b807f93aee6db51edfb4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.19) UNRELEASED; urgency=low
+
+  * Support versions of man that don't use -l.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 04 Dec 2007 15:13:26 -0500
+

 mr (0.18) unstable; urgency=low
 
   * darcs: Use record subcommand, there is no commit subcommand. Closes: #453501
 mr (0.18) unstable; urgency=low
 
   * darcs: Use record subcommand, there is no commit subcommand. Closes: #453501

diff --git a/mr b/mr
index 3a729e4ab12dafffad6ca8e01cb6bd29eb9044cd..f4a93b6472b779db3fa8902a180c05de157a699a 100755 (executable)
--- a/mr
+++ b/mr
@@ -1250,7 +1250,10 @@ help =
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi

-       (pod2man -c mr "$MR_PATH" | man -l -) || error "pod2man or man failed"
+       tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
+       trap "rm -f $tmp" exit
+       pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
+       man -l "$tmp" || error "man failed"

 list = true
 config = 
 
 list = true
 config =