diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-03 08:45:28 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-03 08:45:28 +0000 |
| commit | 047074afcbfbd6a571d6c88737a39c698a5c487a (patch) | |
| tree | 4e1f931891d0a4d51bf70ff8c7582b345fd5c728 /usr.bin/mandoc | |
| parent | 82b1ba02e09730347c9505c042847a93feaa6167 (diff) | |
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@.
Diffstat (limited to 'usr.bin/mandoc')
| -rw-r--r-- | usr.bin/mandoc/apropos.1 | 7 | ||||
| -rw-r--r-- | usr.bin/mandoc/main.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.1 | 7 | ||||
| -rw-r--r-- | usr.bin/mandoc/mandoc.1 | 7 |
4 files changed, 14 insertions, 11 deletions
diff --git a/usr.bin/mandoc/apropos.1 b/usr.bin/mandoc/apropos.1 index 2fe06c76705..71a83ca4ecd 100644 --- a/usr.bin/mandoc/apropos.1 +++ b/usr.bin/mandoc/apropos.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: apropos.1,v 1.30 2015/03/29 21:12:00 bentley Exp $ +.\" $OpenBSD: apropos.1,v 1.31 2015/04/03 08:45:27 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 29 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/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c index 05290a6adc8..f9b049c4a2a 100644 --- a/usr.bin/mandoc/main.c +++ b/usr.bin/mandoc/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.136 2015/04/02 21:03:18 schwarze Exp $ */ +/* $OpenBSD: main.c,v 1.137 2015/04/03 08:45:27 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -972,7 +972,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/usr.bin/mandoc/man.1 b/usr.bin/mandoc/man.1 index 58eaf4da679..ff3136caf4f 100644 --- a/usr.bin/mandoc/man.1 +++ b/usr.bin/mandoc/man.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.1,v 1.11 2015/02/16 16:18:02 schwarze Exp $ +.\" $OpenBSD: man.1,v 1.12 2015/04/03 08:45:27 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/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1 index b8443e3d6d9..a3715d3b1f8 100644 --- a/usr.bin/mandoc/mandoc.1 +++ b/usr.bin/mandoc/mandoc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc.1,v 1.82 2015/03/29 21:12:00 bentley Exp $ +.\" $OpenBSD: mandoc.1,v 1.83 2015/04/03 08:45:27 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 29 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 |