Module Name: src
Committed By: elric
Date: Sun Apr 24 21:42:06 UTC 2011
Modified Files:
src/libexec/ftpd: Makefile
src/libexec/telnetd: Makefile
src/usr.bin/login: Makefile
src/usr.bin/passwd: Makefile
src/usr.bin/su: Makefile
src/usr.bin/telnet: Makefile
Log Message:
We no longer need -I/usr/include/krb5.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.47 -r1.48 src/libexec/telnetd/Makefile
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/login/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/passwd/Makefile
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/su/Makefile
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/telnet/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/Makefile
diff -u src/libexec/ftpd/Makefile:1.60 src/libexec/ftpd/Makefile:1.61
--- src/libexec/ftpd/Makefile:1.60 Sun Mar 15 07:48:36 2009
+++ src/libexec/ftpd/Makefile Sun Apr 24 21:42:06 2011
@@ -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
#
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.47 src/libexec/telnetd/Makefile:1.48
--- src/libexec/telnetd/Makefile:1.47 Fri Apr 15 18:05:45 2011
+++ src/libexec/telnetd/Makefile Sun Apr 24 21:42:06 2011
@@ -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}
Index: src/usr.bin/login/Makefile
diff -u src/usr.bin/login/Makefile:1.51 src/usr.bin/login/Makefile:1.52
--- src/usr.bin/login/Makefile:1.51 Tue Dec 29 19:26:13 2009
+++ src/usr.bin/login/Makefile Sun Apr 24 21:42:06 2011
@@ -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
Index: src/usr.bin/passwd/Makefile
diff -u src/usr.bin/passwd/Makefile:1.41 src/usr.bin/passwd/Makefile:1.42
--- src/usr.bin/passwd/Makefile:1.41 Mon May 28 12:06:29 2007
+++ src/usr.bin/passwd/Makefile Sun Apr 24 21:42:06 2011
@@ -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}
Index: src/usr.bin/su/Makefile
diff -u src/usr.bin/su/Makefile:1.49 src/usr.bin/su/Makefile:1.50
--- src/usr.bin/su/Makefile:1.49 Sun Apr 6 09:54:37 2008
+++ src/usr.bin/su/Makefile Sun Apr 24 21:42:06 2011
@@ -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
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.44 src/usr.bin/telnet/Makefile:1.45
--- src/usr.bin/telnet/Makefile:1.44 Wed Feb 3 15:34:46 2010
+++ src/usr.bin/telnet/Makefile Sun Apr 24 21:42:06 2011
@@ -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}
