diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-10-16 23:53:37 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-10-16 23:53:37 +0000 |
commit | 23ffbc10116222c77d52dcece6c9bbca424b5120 (patch) | |
tree | 5cbd3b466c4ec85f909fc117fe05fe387118ad63 /Makefile.inc1 | |
parent | c38230eb546839ae4ef024b695d3d8711e41e574 (diff) | |
download | src-23ffbc10116222c77d52dcece6c9bbca424b5120.tar.gz src-23ffbc10116222c77d52dcece6c9bbca424b5120.zip |
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
Notes
Notes:
svn path=/head/; revision=289435
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a6ea0858a5ad..2cfea9e422a7 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 |