- Run makewhatis(1) in etc/Makefile at the end of "install".

- Removed redundant and undocumented NO_MAKEDB_RUN knob.

Makefile.inc1

@@ -93,7 +93,7 @@ SUBDIR+= usr.bin
 SUBDIR+= usr.sbin
 .endif
 
-# etc must be last for "distribute" to work
+# etc must be last for install/distribute to work
 .if exists(${.CURDIR}/etc)
 SUBDIR+= etc
 .endif
@@ -432,13 +432,6 @@ reinstall:
 	@echo ">>> Installing everything.."
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding man page indices"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/share/man; ${MAKE} makedb
-.endif
 
 redistribute:
 	@echo "--------------------------------------------------------------"

etc/Makefile

@@ -56,7 +56,13 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
+afterinstall:
+.if !defined(NOMAN)
+	cd ${.CURDIR}/../share/man; ${MAKE} makedb
+.endif
+
 distribute:
+	cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION}
 	cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
@@ -156,9 +162,6 @@ distribution:
 	    ${DESTDIR}/var/crash
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
-.if !defined(NOMAN)
-	cd ${.CURDIR}/../share/man; ${MAKE} makedb
-.endif
 
 distrib-dirs:
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/

release/Makefile

@@ -535,7 +535,7 @@ release.2:
 release.3:
 	# Handle some grief caused by the munition braindeadness.
 	cd ${.CURDIR}/..; \
-	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
+	${CROSSMAKE} ${WORLD_FLAGS} -DNOCRYPT \
 	    SUBDIR_OVERRIDE="${FIXCRYPTO}" \
 	    buildworld distributeworld DISTDIR=${RD}/trees
 	-chflags -R noschg ${RD}/trees