- Add an OPTIONAL_MANPATH directive (same as MANDATORY_MANPATH,

  except an absence of the directory is not considered an error
  and doesn't produce a warning).
  Put /usr/local/lib/perl5/*/man under OPTIONAL_MANPATH.

- An order of directives in manpath.config is now irrelevant.

- Get rid of infinite loop when PATH is unset or NULL, and
  MANDATORY_MANPATH directory doesn't exist.

- mdoc(9)ify manpage.

Reviewed by:	des, markm, sheldonh

1 files changed, 9 insertions, 7 deletions

diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index 2beb011ee3cd..a1fcdd3ea2f4 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -1,11 +1,12 @@
-#	$Id: manpath.config,v 1.10 1999/05/13 15:47:04 ache Exp $
+#	$Id: manpath.config,v 1.11 1999/07/25 19:33:06 markm Exp $
 #
-# This file is read by manpath to configure the mandatory manpath, to
-# map each path element to a manpath element and to determine where the
-# "man" binary lives.  The format is:
+# This file is read by manpath(1) to configure the mandatory and
+# optional manpath, to map each path element to a manpath element
+# and to determine where the "man" binary lives.  The format is:
 #
 # MANBIN				pathname
 # MANDATORY_MANPATH			manpath_element
+# OPTIONAL_MANPATH			manpath_element
 # MANPATH_MAP		path_element	manpath_element
 #
 # MANBIN is optional
@@ -16,9 +17,10 @@
 #
 MANDATORY_MANPATH	/usr/share/man
 MANDATORY_MANPATH	/usr/share/perl/man
-#MANDATORY_MANPATH	/usr/local/man
-#MANDATORY_MANPATH	/usr/local/lib/perl5/5.00503/man
-MANDATORY_MANPATH	/usr/X11R6/man
+#
+# check if the directory exists and if it does, add it to MANPATH
+#
+OPTIONAL_MANPATH	/usr/local/lib/perl5/5.00503/man
 #
 # set up PATH to MANPATH mapping
 #