d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix adding manpages installed by LOCAL_DIRS to whatis file.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-10-16 23:53:37 +00:00
parent c38230eb54
commit 23ffbc1011
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.inc1
View File

@ -88,10 +88,6 @@ SUBDIR+= tests
.if ${MK_OFED} != "no" .if ${MK_OFED} != "no"
SUBDIR+=contrib/ofed SUBDIR+=contrib/ofed
.endif .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 # Local directories are last, since it is nice to at least get the base
# system rebuilt before you do them. # system rebuilt before you do them.
@ -115,6 +111,12 @@ SUBDIR+= ${_DIR}
.endfor .endfor
.endif .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) .if defined(NOCLEAN)
NO_CLEAN= ${NOCLEAN} NO_CLEAN= ${NOCLEAN}
.endif .endif