Author: bdrewery
Date: Fri Oct 16 23:53:37 2015
New Revision: 289435
URL: https://svnweb.freebsd.org/changeset/base/289435
Log:
Fix adding manpages installed by LOCAL_DIRS to whatis file.
The ordering of 'etc' in the install has a long history dating back to the
first time it was realized it needed to be "last" in r4486. That commit
still left it before LOCAL_DIRS though. By having it before LOCAL_DIRS
any manpages they install were not being added to the whatis database in the
install image. They would likely show up in the file after a periodic
rebuild of the file though.
Currently the whatis file is built by an 'afterinstall' hook in etc/Makefile
that calls share/man's 'makedb' target.
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Oct 16 22:41:31 2015 (r289434)
+++ head/Makefile.inc1 Fri Oct 16 23:53:37 2015 (r289435)
@@ -88,10 +88,6 @@ SUBDIR+= tests
.if ${MK_OFED} != "no"
SUBDIR+=contrib/ofed
.endif
-#
-# We must do etc/ last for install/distribute to work.
-#
-SUBDIR+=etc
# Local directories are last, since it is nice to at least get the base
# system rebuilt before you do them.
@@ -115,6 +111,12 @@ SUBDIR+= ${_DIR}
.endfor
.endif
+# We must do etc/ last as it hooks into building the man whatis file
+# by calling 'makedb' in share/man. This is only relevant for
+# install/distribute so they build the whatis file after every manpage is
+# installed.
+SUBDIR+=etc
+
.if defined(NOCLEAN)
NO_CLEAN= ${NOCLEAN}
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
