 -MANPATH	/usr/local/man
 -MANPATH	/usr/local/share/man
 -MANPATH	/usr/X11R6/man
-+MANPATH	/boot/common/man
-+MANPATH	/boot/common/share/man
-+MANPATH	/boot/home/config/man
-+MANPATH	/boot/home/config/share/man
-+MANPATH	/boot/common/*/man
-+MANPATH	/boot/common/*/share/man
-+MANPATH	/boot/home/config/*/man
-+MANPATH	/boot/home/config/*/share/man
++MANPATH	@haikuUserNonPackagedManDir@
++MANPATH	@haikuUserManDir@
++MANPATH	@haikuCommonNonPackagedManDir@
++MANPATH	@haikuCommonManDir@
++MANPATH	@haikuSystemManDir@
  #
  # Uncomment if you want to include one of these by default
  #
-@@ -58,15 +61,9 @@ MANPATH	/usr/X11R6/man
+@@ -58,15 +58,7 @@
  # in the mandatory manpath already, but will keep man from statting
  # lots of other nearby files and directories.
  #

 all: man$(EXEEXT) man.conf apropos whatis makewhatis
 
 MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \
diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in
--- man-1.6g/src/man.conf.in.orig	2010-10-25 18:22:24.008388608 -0600
+++ man-1.6g/src/man.conf.in	2012-05-02 21:57:49.699400192 -0600
@@ -36,11 +36,14 @@
 #
 # Every automatically generated MANPATH includes these fields
 #

-MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
-MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
-MANPATH_MAP	/usr/bin/mh		/usr/share/man
+MANPATH_MAP	/bin			@haikuSystemManDir@
 #
 # NOAUTOPATH keeps man from automatically adding directories that look like
 # manual page directories to the path.
