Module Name: src
Committed By: martin
Date: Wed Feb 11 14:46:36 UTC 2015
Modified Files:
src/usr.bin/passwd [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by aymeric in ticket #1251):
usr.bin/passwd/Makefile: revision 1.43,1.44
don't build kpasswd; heimdal does it for us.
Keep the built-in support for passwd -k, but don't make the kpasswd link or
install the kpasswd man page.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.6.1 src/usr.bin/passwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/passwd/Makefile
diff -u src/usr.bin/passwd/Makefile:1.42 src/usr.bin/passwd/Makefile:1.42.6.1
--- src/usr.bin/passwd/Makefile:1.42 Sun Apr 24 21:42:06 2011
+++ src/usr.bin/passwd/Makefile Wed Feb 11 14:46:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.42.6.1 2015/02/11 14:46:36 martin Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
.include <bsd.own.mk>
@@ -31,9 +31,11 @@ SRCS+= krb5_passwd.c
DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
+.ifdef OVERRIDE_HEIMDAL_KPASSWD
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1
.endif
+.endif
.if (${USE_PAM} != "no")
CPPFLAGS+=-DUSE_PAM
