From ce80f29eb86a1f958baafc25458619fe6b17112f Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 3 Apr 2015 08:46:17 +0000 Subject: 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@. --- apropos.1 | 7 ++++--- main.c | 4 ++-- man.1 | 7 ++++--- mandoc.1 | 7 ++++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apropos.1 b/apropos.1 index 967a3243..10ba3c6a 100644 --- 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 .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze @@ -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 6f15e38f..61e90fe5 100644 --- 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 * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze @@ -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 85802967..d0d74a77 100644 --- 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 64069067..53f15db4 100644 --- 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 .\" Copyright (c) 2012, 2014, 2015 Ingo Schwarze @@ -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 -- cgit v1.2.3-56-ge451