6 files changed, 9 insertions, 2 deletions
diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
index f8f329842eb4..af176036f136 100644
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -24,6 +24,8 @@
 # SUCH DAMAGE.
 #
 
+PACKAGE?=	atf
+LIB_PACKAGE=
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 985a79b7dc03..4f4f7f12ec05 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -27,7 +27,6 @@
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
-PACKAGE=	tests
 LIB_CXX=	atf-c++
 PRIVATELIB=	true
 SHLIB_MAJOR=	2
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
index 4b95f8dbd663..55cefe524068 100644
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -1,5 +1,7 @@
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 4cfee2ed824f..c0890abc7640 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -27,7 +27,6 @@
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
-PACKAGE=	tests
 LIB=		atf-c
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile
index 5123f6f4d796..3fa2919b98b9 100644
--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@@ -1,5 +1,7 @@
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile
index 500ff0f20c3b..2609bb593d57 100644
--- a/lib/atf/tests/Makefile
+++ b/lib/atf/tests/Makefile
@@ -1,4 +1,7 @@
 .PATH:		${SRCTOP}/tests
+
+PACKAGE=	tests
+
 KYUAFILE=	yes
 
 SUBDIR=		test-programs