--- man-1.5k/configure.orig	Sat Jul 27 07:11:52 2002
+++ man-1.5k/configure	Sat Jul 27 07:14:07 2002
@@ -81,8 +81,7 @@
 	  confexplicit=1
 	  ;;
       -confdir)
-          setconfdir=true;
-          ;;
+          setconfdir=true; ;;
       +lang)
 	  setlang=true
 	  ;;
@@ -143,8 +142,8 @@
 # The FHS wants it in /usr/share/misc
 # All documentation assumes "man.conf" - in case you invent some other name
 # (why?), also man pages and other docs need to be patched.
-prefix="/usr"
-confprefix="/usr"
+prefix=@PREFIX@
+confprefix=@PREFIX@
 bindir="bin"
 sbindir="sbin"
 mandir="man"
@@ -154,7 +153,7 @@
 if [ -z $confexplicit ]; then
   confdir="lib"
   if [ x"$usefhs" = xtrue ]; then
-    confdir="share/misc"
+    confdir="etc"
   fi
 else
   confprefix=""
@@ -317,7 +316,7 @@
 # word-splitting at different moments, which means that
 #   for i in /bin:/usr/bin:$PATH
 # does not work everywhere.)
-PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
+PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH:${prefix}/bin
 IFS0="$IFS"
 IFS=":$IFS"
 for i in $PREPATH
--- man-1.5k/man2html/Makefile.in.orig	Sat Jul 27 07:15:28 2002
+++ man-1.5k/man2html/Makefile.in	Sat Jul 27 07:17:44 2002
@@ -1,7 +1,7 @@
 CC = @CC@
 CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -O
 OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
-bindir = $(PREFIX)/usr/bin
+bindir = $(PREFIX)@PREFIX@/bin
 mandir = $(PREFIX)@mandir@
 vardir = $(PREFIX)/var
 httpdir = $(PREFIX)/home/httpd
--- man-1.5k/src/man.c.orig	Sat Jul 27 07:14:32 2002
+++ man-1.5k/src/man.c	Sat Jul 27 07:15:11 2002
@@ -1198,9 +1198,11 @@
 
 
 #ifndef __FreeBSD__ 
+#ifndef __APPLE__
      /* Slaven Rezif: FreeBSD-2.2-SNAP does not recognize LC_MESSAGES. */
      setlocale(LC_CTYPE, "");	/* used anywhere? maybe only isdigit()? */
      setlocale(LC_MESSAGES, "");
+#endif
 #endif
 
      /* No doubt we'll need some generic language code here later.