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

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

Browse Source 
- Removed redundant and undocumented NO_MAKEDB_RUN knob.
This commit is contained in:
Ruslan Ermilov 2004-01-22 08:18:37 +00:00
parent 5cfe0423e6
commit bbe8270c50
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc1
View File

@ -93,7 +93,7 @@ SUBDIR+= usr.bin
SUBDIR+= usr.sbin SUBDIR+= usr.sbin
.endif .endif
# etc must be last for "distribute" to work # etc must be last for install/distribute to work
.if exists(${.CURDIR}/etc) .if exists(${.CURDIR}/etc)
SUBDIR+= etc SUBDIR+= etc
.endif .endif
@ -432,13 +432,6 @@ reinstall:
@echo ">>> Installing everything.." @echo ">>> Installing everything.."
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install 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: redistribute:
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"

9
etc/Makefile
View File

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

2
release/Makefile
View File

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