From e98d6de67c777ce0ee0f9957d4f3330b13f4cdf8 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Fri, 9 Jan 1998 23:56:45 +0000 Subject: [PATCH] Use manpath(1) to determine the value of ${MANPATH} instead of using one of two hard-coded values. PR: 5365 Submitted by: Ruslan Shevchenko --- etc/periodic/weekly/320.whatis | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis index 6ae23a4f9337..fc91e7f20813 100755 --- a/etc/periodic/weekly/320.whatis +++ b/etc/periodic/weekly/320.whatis @@ -1,18 +1,19 @@ #!/bin/sh - # -# $Id: 320.whatis,v 1.1.1.1 1997/08/12 17:51:16 pst Exp $ +# $Id: 320.whatis,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $ # -if [ -x /usr/libexec/makewhatis.local -a -d /usr/share/man ] ; then +if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ] ; then echo "" echo "Rebuilding whatis database:" - if [ -d /usr/X11R6/man ] ; then - MANPATH=${MANPATH:-/usr/share/man:/usr/X11R6/man:/usr/local/man} - else - MANPATH=${MANPATH:-/usr/share/man:/usr/local/man} + MANPATH=`/usr/bin/manpath -q` + if [ $? = 0 ]; then + if [ "x${MANPATH}" = "x" ]; then + echo "manpath failed to find any manpage directories" + else + /usr/libexec/makewhatis.local "${MANPATH}" + fi fi - - /usr/libexec/makewhatis.local "${MANPATH}" fi