3 files changed, 33 insertions, 2 deletions
diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index b3ccb46..4616338 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -1,6 +1,21 @@
+#
+# Set a bunch of things to hardcoded paths so that we don't accidently
+# pick up a user's own version of some utility and hose ourselves.
+#
 BINDIR?=		/usr/bin
 libdir=			/etc
 bindir=			${BINDIR}
-pager=			/usr/gnu/bin/less -sC
+pager=			less -sCe
 manpath_config_file=	/etc/manpath.config
 troff=			/usr/bin/groff -Tps -man
+nroff=			/usr/bin/groff -Tascii -man
+apropos=		/usr/bin/apropos
+whatis=			/usr/bin/whatis
+neqn=			/usr/bin/eqn -Tascii
+tbl=			/usr/bin/tbl
+col=			/usr/bin/col
+vgrind=			/usr/bin/vgrind
+refer=			/usr/bin/refer
+grap=			# no grap
+pic=			/usr/bin/pic
+zcat=			/usr/bin/zcat
diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile
index 33bd40b..0d9081d 100644
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@@ -1,10 +1,23 @@
 LIB = man
 
 CFLAGS+= -I${.CURDIR} -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS
-
+CLEANFILES+=	${.CURDIR}/config.h
 SRCS =	util.c gripes.c
 
+libman.a::	${.CURDIR}/config.h
+
 install:
 	@echo -n
 
+${.CURDIR}/config.h:	${.CURDIR}/config.h_dist ../Makefile.inc
+	sed -e 's,%apropos%,${apropos},' -e 's,%whatis%,${whatis},' \
+	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
+	    -e 's,%nroff%,${nroff},' -e 's,%tbl%,${tbl},' \
+	    -e 's,%col%,${col},' -e 's,%pic%,${pic},' \
+	    -e 's,%eqn%,${eqn},' -e 's,%neqn%,${neqn},' \
+	    -e 's,%vgrind%,${vgrind},' -e 's,%refer%,${refer},' \
+	    -e 's,%grap%,${grap},' -e 's,%zcat%,${zcat},' \
+	    -e 's,%manpath_config_file%,${manpath_config_file},' \
+        ${.CURDIR}/config.h_dist > ${.CURDIR}/config.h
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 76fdf9b..52e009e 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -16,4 +16,7 @@ manpath.1: manpath.man
 	    -e 's,%manpath_config_file%,${manpath_config_file},' \
 	manpath.man > manpath.1
 
+afterinstall:
+	install -c -o bin -g bin -m 555 ${.CURDIR}/manpath.config ${manpath_config_file}
+
 .include <bsd.prog.mk>