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

Separate BLACKLIST vs BLACKLIST_SUPPORT properly

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Kurt Lidl 2016-06-07 16:31:03 +00:00
parent 9349564fec
commit c0759dac0d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/Makefile
View File

@ -86,7 +86,7 @@ BIN1+= apmd.conf
BIN1+= auto_master
.endif
.if ${MK_BLACKLIST_SUPPORT} != "no"
.if ${MK_BLACKLIST} != "no"
BIN1+= blacklistd.conf
.endif

2
etc/rc.d/Makefile
View File

@ -170,7 +170,7 @@ FILES+= automountd
FILES+= autounmountd
.endif
.if ${MK_BLACKLIST_SUPPORT} != "no"
.if ${MK_BLACKLIST} != "no"
_blacklistd+= blacklistd
.endif

2
lib/Makefile
View File

@ -161,7 +161,7 @@ SUBDIR_DEPEND_liblzma= ${_libthr}
_libngatm= libngatm
.endif
.if ${MK_BLACKLIST_SUPPORT} != "no"
.if ${MK_BLACKLIST} != "no"
_libblacklist= libblacklist
.endif

2
libexec/Makefile
View File

@ -34,7 +34,7 @@ SUBDIR= ${_atf} \
_atrun= atrun
.endif
.if ${MK_BLACKLIST_SUPPORT} != "no"
.if ${MK_BLACKLIST} != "no"
_blacklistd-helper+= blacklistd-helper
.endif

2
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -431,7 +431,7 @@ OLD_FILES+=usr/share/man/man7/ldint.7.gz
OLD_FILES+=usr/share/man/man7/binutils.7.gz
.endif
.if ${MK_BLACKLIST_SUPPORT} == no
.if ${MK_BLACKLIST} == no
OLD_FILES+=etc/rc.d/blacklistd
OLD_FILES+=usr/include/blacklist.h
OLD_FILES+=usr/lib/libblacklist.a

6
usr.sbin/Makefile
View File

@ -113,9 +113,9 @@ SUBDIR.${MK_AUDIT}+= auditreduce
SUBDIR.${MK_AUDIT}+= praudit
SUBDIR.${MK_AUTHPF}+= authpf
SUBDIR.${MK_AUTOFS}+= autofs
.if ${MK_BLACKLIST_SUPPORT} != "no"
SUBDIR.${MK_BLACKLIST_SUPPORT}+= blacklistctl
SUBDIR.${MK_BLACKLIST_SUPPORT}+= blacklistd
.if ${MK_BLACKLIST} != "no"
SUBDIR.${MK_BLACKLIST}+= blacklistctl
SUBDIR.${MK_BLACKLIST}+= blacklistd
.endif
SUBDIR.${MK_BLUETOOTH}+= bluetooth
SUBDIR.${MK_BOOTPARAMD}+= bootparamd