Sun Apr 24 21:42:06 2011 UTC ()
We no longer need -I/usr/include/krb5.
(elric)
diff -r1.60 -r1.61 src/libexec/ftpd/Makefile
diff -r1.47 -r1.48 src/libexec/telnetd/Makefile
diff -r1.51 -r1.52 src/usr.bin/login/Makefile
diff -r1.41 -r1.42 src/usr.bin/passwd/Makefile
diff -r1.49 -r1.50 src/usr.bin/su/Makefile
diff -r1.44 -r1.45 src/usr.bin/telnet/Makefile
--- src/libexec/ftpd/Makefile 2009/03/15 07:48:36 1.60
+++ src/libexec/ftpd/Makefile 2011/04/24 21:42:06 1.61
@@ -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
#
--- src/libexec/telnetd/Makefile 2011/04/15 18:05:45 1.47
+++ src/libexec/telnetd/Makefile 2011/04/24 21:42:06 1.48
@@ -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}
--- src/usr.bin/login/Makefile 2009/12/29 19:26:13 1.51
+++ src/usr.bin/login/Makefile 2011/04/24 21:42:06 1.52
@@ -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
--- src/usr.bin/passwd/Makefile 2007/05/28 12:06:29 1.41
+++ src/usr.bin/passwd/Makefile 2011/04/24 21:42:06 1.42
@@ -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}
--- src/usr.bin/su/Makefile 2008/04/06 09:54:37 1.49
+++ src/usr.bin/su/Makefile 2011/04/24 21:42:06 1.50
@@ -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
--- src/usr.bin/telnet/Makefile 2010/02/03 15:34:46 1.44
+++ src/usr.bin/telnet/Makefile 2011/04/24 21:42:06 1.45
@@ -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}