Module Name:    src
Committed By:   dholland
Date:           Fri Aug 26 23:55:04 UTC 2016

Modified Files:
        src/external/bsd/kyua-testers/libexec/kyua-atf-tester: Makefile
        src/external/bsd/kyua-testers/libexec/kyua-plain-tester: Makefile
        src/external/bsd/kyua-testers/tests/kyua-testers: Makefile

Log Message:
Fix previous. (Sigh.) PR 51389 again.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/kyua-testers/tests/kyua-testers/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.2 src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.3
--- src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.2	Sun Aug  7 20:23:09 2016
+++ src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile	Fri Aug 26 23:55:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,8 @@ ATFTESTER_LIBDIR!=	cd ${.CURDIR}/../../l
 TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
 LDADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
 DPADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
-LDADD+=		${TESTER_LIBDIR}/libtester/libtester.a
-DPADD+=		${TESTER_LIBDIR}/libtester/libtester.a
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libtester

Index: src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.2 src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.3
--- src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.2	Sun Aug  7 20:23:09 2016
+++ src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile	Fri Aug 26 23:55:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -12,8 +12,8 @@ MAN=		kyua-plain-tester.1
 MAN+=		kyua-plain-interface.7
 
 TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
-LDADD+=		${TESTER_LIBDIR}/libtester/libtester.a
-DPADD+=		${TESTER_LIBDIR}/libtester/libtester.a
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libtester

Index: src/external/bsd/kyua-testers/tests/kyua-testers/Makefile
diff -u src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.2 src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.3
--- src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.2	Sun Aug  7 20:23:09 2016
+++ src/external/bsd/kyua-testers/tests/kyua-testers/Makefile	Fri Aug 26 23:55:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,8 @@ ATFTESTER_LIBDIR!=	cd ${.CURDIR}/../../l
 TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
 LDADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
 DPADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
-LDADD+=		${TESTER_LIBDIR}/libtester/libtester.a
-DPADD+=		${TESTER_LIBDIR}/libtester/libtester.a
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 TESTS_C=	atf_list_test
 TESTS_C+=	atf_result_test

Reply via email to