No need to hardcode /usr/bin/ as the path to more(1); helps portability.

We don't hardcode the paths to gunzip(1) and cmp(1) either.
Discussed with ajacoutot@.

diff --git a/apropos.1 b/apropos.1
index 967a3243828559ab87156e050552f8dfca1efa51..10ba3c6a454d9014f4c2139b6cd7c87c5e809d2d 100644 (file)
--- a/apropos.1
+++ b/apropos.1
@@ -1,4 +1,4 @@
-.\"    $Id: apropos.1,v 1.38 2015/03/30 16:06:14 schwarze Exp $
+.\"    $Id: apropos.1,v 1.39 2015/04/03 08:46:17 schwarze Exp $
 .\"
 .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 30 2015 $
+.Dd $Mdocdate: April 3 2015 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -365,7 +365,8 @@ Specifies the pagination program to use when
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Pa /usr/bin/more Fl s
+.Xr more 1
+.Fl s
 will be used.
 .El
 .Sh FILES

diff --git a/main.c b/main.c
index 6f15e38fb1b83d7a4dca3be5d2558b1fed0e4bbc..61e90fe581f52d22c0e95a20a2e31c2c7683b34f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.231 2015/04/02 21:36:49 schwarze Exp $ */
+/*     $Id: main.c,v 1.232 2015/04/03 08:46:17 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -997,7 +997,7 @@ spawn_pager(void)
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')
-               pager = "/usr/bin/more -s";
+               pager = "more -s";
        cp = mandoc_strdup(pager);
 
        /*

diff --git a/man.1 b/man.1
index 85802967e6277b5e5948a743bdcd4dbe2f43fdc0..d0d74a77b53e15856bb97857864410344e9be1d4 100644 (file)
--- a/man.1
+++ b/man.1
@@ -1,4 +1,4 @@
-.\"    $Id: man.1,v 1.13 2015/02/16 16:23:54 schwarze Exp $
+.\"    $Id: man.1,v 1.14 2015/04/03 08:46:17 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)man.1      8.2 (Berkeley) 1/2/94
 .\"
-.Dd $Mdocdate: February 16 2015 $
+.Dd $Mdocdate: April 3 2015 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -381,7 +381,8 @@ Specifies the pagination program to use when
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Pa /usr/bin/more Fl s
+.Xr more 1
+.Fl s
 will be used.
 .El
 .Sh FILES

diff --git a/mandoc.1 b/mandoc.1
index 64069067d7ed05d64227004cf27cd1452e033acc..53f15db479eb333a213c15ba80d97ebb8243b95a 100644 (file)
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\"    $Id: mandoc.1,v 1.158 2015/03/30 16:06:14 schwarze Exp $
+.\"    $Id: mandoc.1,v 1.159 2015/04/03 08:46:17 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 30 2015 $
+.Dd $Mdocdate: April 3 2015 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -502,7 +502,8 @@ Specifies the pagination program to use when
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
-.Pa /usr/bin/more Fl s
+.Xr more 1
+.Fl s
 will be used.
 .El
 .Sh EXIT STATUS