summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-11-26 14:36:04 +0000
committerdim <dim@FreeBSD.org>2014-11-26 14:36:04 +0000
commit5340ca17abf7709215d1616620ef13a4e71ec290 (patch)
tree16df3967a7d00765eaaeec20c4eaa68ad7933341 /lib
parentcb8fb3ea0e08997bec07a86af5cba585aef0ffe5 (diff)
downloadFreeBSD-src-5340ca17abf7709215d1616620ef13a4e71ec290.zip
FreeBSD-src-5340ca17abf7709215d1616620ef13a4e71ec290.tar.gz
After some horrible wrestling with Subversion's worthless merge
implementation, merge ^/head r275078 through r275117. Note that all the extraneous mergeinfo is there because Subversion created it. I'll hopefully be able to remove it again when merging back to head.
Diffstat (limited to 'lib')
-rw-r--r--lib/libpam/libpam/tests/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libpam/libpam/tests/Makefile b/lib/libpam/libpam/tests/Makefile
index 2ad64e2..4532ace 100644
--- a/lib/libpam/libpam/tests/Makefile
+++ b/lib/libpam/libpam/tests/Makefile
@@ -13,7 +13,6 @@ SRCS.${test} = ${test}.c ${COMMONSRC}
CFLAGS +=-I${OPENPAM}/include -I${OPENPAM}/lib/libpam -I${OPENPAM}/t
WARNS ?= 6
-DPADD = ${LIBPAM}
-LDADD = ${MINUSLPAM}
+LIBADD = pam
.include <bsd.test.mk>
OpenPOWER on IntegriCloud