[src/trunk]: src We no longer need -I/usr/include/krb5.

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

details:   https://anonhg.NetBSD.org/src/rev/077434ff1842
branches:  trunk
changeset: 764471:077434ff1842
user:      elric <elric%NetBSD.org@localhost>
date:      Sun Apr 24 21:42:06 2011 +0000

description:
We no longer need -I/usr/include/krb5.

diffstat:

 libexec/ftpd/Makefile    |  3 +--
 libexec/telnetd/Makefile |  3 +--
 usr.bin/login/Makefile   |  4 ++--
 usr.bin/passwd/Makefile  |  4 ++--
 usr.bin/su/Makefile      |  4 ++--
 usr.bin/telnet/Makefile  |  3 +--
 6 files changed, 9 insertions(+), 12 deletions(-)

diffs (105 lines):

diff -r ba3b43b93342 -r 077434ff1842 libexec/ftpd/Makefile
--- a/libexec/ftpd/Makefile     Sun Apr 24 21:35:29 2011 +0000
+++ b/libexec/ftpd/Makefile     Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.60 2009/03/15 07:48:36 lukem Exp $
+#      $NetBSD: Makefile,v 1.61 2011/04/24 21:42:06 elric Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/4/94
 
 .include <bsd.own.mk>
@@ -43,7 +43,6 @@
 #
 #SRCS+=        k5login.c
 #CPPFLAGS+=-DKERBEROS5
-#CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
 #DPADD+=       ${LIBKRB5} ${LIBASN1}
 #LDADD+= -lkrb5 -lasn1
 #
diff -r ba3b43b93342 -r 077434ff1842 libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Sun Apr 24 21:35:29 2011 +0000
+++ b/libexec/telnetd/Makefile  Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.47 2011/04/15 18:05:45 elric Exp $
+#      $NetBSD: Makefile,v 1.48 2011/04/24 21:42:06 elric Exp $
 #      from: @(#)Makefile      8.2 (Berkeley) 12/15/93
 
 WARNS?=        2               # XXX: const issues in sys_term.c
@@ -21,7 +21,6 @@
 LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
 LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
 DPADD+=        ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
diff -r ba3b43b93342 -r 077434ff1842 usr.bin/login/Makefile
--- a/usr.bin/login/Makefile    Sun Apr 24 21:35:29 2011 +0000
+++ b/usr.bin/login/Makefile    Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.51 2009/12/29 19:26:13 christos Exp $
+#      $NetBSD: Makefile,v 1.52 2011/04/24 21:42:06 elric Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 
 WARNS?=        2       # XXX -Wcast-qual issues
@@ -24,7 +24,7 @@
 
 .if (${USE_KERBEROS} != "no")
 SRCS+= k5login.c
-CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+=-DKERBEROS5
 DPADD+=        ${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 
diff -r ba3b43b93342 -r 077434ff1842 usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile   Sun Apr 24 21:35:29 2011 +0000
+++ b/usr.bin/passwd/Makefile   Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.41 2007/05/28 12:06:29 tls Exp $
+#      $NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
 #      from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 
 .include <bsd.own.mk>
@@ -26,7 +26,7 @@
 BINMODE=4555
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+= -DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -DKERBEROS5
 SRCS+= krb5_passwd.c
 
 DPADD+=        ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
diff -r ba3b43b93342 -r 077434ff1842 usr.bin/su/Makefile
--- a/usr.bin/su/Makefile       Sun Apr 24 21:35:29 2011 +0000
+++ b/usr.bin/su/Makefile       Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.49 2008/04/06 09:54:37 lukem Exp $
+#      $NetBSD: Makefile,v 1.50 2011/04/24 21:42:06 elric Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -45,7 +45,7 @@
 LDADD+= -lkafs
 .endif
 
-CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+=-DKERBEROS5
 DPADD+=        ${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 
diff -r ba3b43b93342 -r 077434ff1842 usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Sun Apr 24 21:35:29 2011 +0000
+++ b/usr.bin/telnet/Makefile   Sun Apr 24 21:42:06 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.44 2010/02/03 15:34:46 roy Exp $
+#      $NetBSD: Makefile,v 1.45 2011/04/24 21:42:06 elric Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -63,7 +63,6 @@
 LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-DKRB5 -DFORWARD -DAUTHENTICATION -DENCRYPTION
 LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
 DPADD+=        ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}