svn commit: r275319 - projects/building-blocks/etc

[Garrett Cooper]

Author: ngie
Date: Sun Nov 30 11:59:20 2014
New Revision: 275319
URL: https://svnweb.freebsd.org/changeset/base/275319

Log:
  Honor MK_IPFW with rc.firewall, MK_LOCATE with /var/db/locate.db, and MK_MAN
  with creating manpage symlinks

Modified:
  projects/building-blocks/etc/Makefile

Modified: projects/building-blocks/etc/Makefile
==============================================================================
--- projects/building-blocks/etc/Makefile	Sun Nov 30 11:55:45 2014	(r275318)
+++ projects/building-blocks/etc/Makefile	Sun Nov 30 11:59:20 2014	(r275319)
@@ -39,7 +39,6 @@ BIN1=	crontab \
 	protocols \
 	rc \
 	rc.bsdextended \
-	rc.firewall \
 	rc.initdiskless \
 	rc.shutdown \
 	rc.subr \
@@ -99,6 +98,10 @@ BIN1+= ftpusers
 BIN1+= inetd.conf
 .endif
 
+.if ${MK_IPFW} != "no"
+BIN1+=	rc.firewall
+.endif
+
 .if ${MK_LOCATE} != "no"
 BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 .endif
@@ -322,8 +325,10 @@ distribution:
 .endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
+.if ${MK_LOCATE} != "no"
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
+.endif
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
 	    ${DESTDIR}/var/crash
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
@@ -389,6 +394,7 @@ distrib-dirs: ${MTREES:N/*}
 	done; true
 .endif
 	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+.if ${MK_MAN} != "no"
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
@@ -412,6 +418,7 @@ distrib-dirs: ${MTREES:N/*}
 		fi; \
 		shift; shift; \
 	done
+.endif
 .if ${MK_NLS} != "no"
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \