[src/trunk]: src/usr.bin/passwd Keep the built-in support for passwd -k, but ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2aeb63ea12a4
branches:  trunk
changeset: 784908:2aeb63ea12a4
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 13 23:19:14 2013 +0000

description:
Keep the built-in support for passwd -k, but don't make the kpasswd link or
install the kpasswd man page since these are provided by heimdal. I ifdef'ed
them so that the code to install them is still with the Makefile.

diffstat:

 usr.bin/passwd/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 8ac18b681db3 -r 2aeb63ea12a4 usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile   Wed Feb 13 23:14:35 2013 +0000
+++ b/usr.bin/passwd/Makefile   Wed Feb 13 23:19:14 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.43 2013/02/11 23:11:48 christos Exp $
+#      $NetBSD: Makefile,v 1.44 2013/02/13 23:19:14 christos Exp $
 #      from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 
 .include <bsd.own.mk>
@@ -25,13 +25,13 @@
 BINOWN=        root
 BINMODE=4555
 
-.ifdef OVERRIDE_HEIMDAL_KPASSWD
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+= -DKERBEROS5
 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