diff options
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | libexec/Makefile | 2 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile index 99d905aa3918..b41a806a41e3 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -86,7 +86,7 @@ BIN1+= apmd.conf BIN1+= auto_master .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" BIN1+= blacklistd.conf .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 9737adc4da92..9ad9f91ee756 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -170,7 +170,7 @@ FILES+= automountd FILES+= autounmountd .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _blacklistd+= blacklistd .endif diff --git a/lib/Makefile b/lib/Makefile index d475c6c53fca..0fff80266c97 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -161,7 +161,7 @@ SUBDIR_DEPEND_liblzma= ${_libthr} _libngatm= libngatm .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _libblacklist= libblacklist .endif diff --git a/libexec/Makefile b/libexec/Makefile index fdcc49a3eef8..5c6130a18db6 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -34,7 +34,7 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _blacklistd-helper+= blacklistd-helper .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 9ad814959d65..e658ce148fd7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 8c80266893ef..b08a65a28c88 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -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 |