summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-16 23:53:37 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-16 23:53:37 +0000
commit76795b74c93093a4d93530c380d2de4544e5b66c (patch)
tree5cbd3b466c4ec85f909fc117fe05fe387118ad63 /Makefile.inc1
parent8c5d7c6344268b268b4993b99ef0c9b7371b81ef (diff)
downloadFreeBSD-src-76795b74c93093a4d93530c380d2de4544e5b66c.zip
FreeBSD-src-76795b74c93093a4d93530c380d2de4544e5b66c.tar.gz
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
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc110
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a6ea085..2cfea9e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
OpenPOWER on IntegriCloud