diff options
| author |   hin <hin@openbsd.org> | 2002-06-11 15:23:28 +0000 |
|---|---|---|
| committer | hin <hin@openbsd.org> | 2002-06-11 15:23:28 +0000 |
| commit | c3ae5badd5510ea46d88efdd9326a65b33b5fc18 (patch) | |
| tree | a25e0a2a94e9c2e60dfaf09a8972cf82495929c9 | |
| parent | New libkafs requires everything to link with krb5. (diff) | |
| download | wireguard-openbsd-c3ae5badd5510ea46d88efdd9326a65b33b5fc18.tar.xz wireguard-openbsd-c3ae5badd5510ea46d88efdd9326a65b33b5fc18.zip | |
Make sure kerberosV/kafs.h is picked up if kerberosIV/kafs.h is not removed.
ok markus@
| -rw-r--r-- | kerberosIV/Makefile.inc | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/lib/Makefile | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc index ad9f23a0c6c..03d664dc58b 100644 --- a/kerberosIV/Makefile.inc +++ b/kerberosIV/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2002/06/09 19:05:39 hin Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2002/06/11 15:23:28 hin Exp $ KRBDIR = ${.CURDIR}/${KRBDEPTH} KRBSRC = ${.CURDIR}/${KRBDEPTH}/src @@ -7,6 +7,7 @@ KRB5DIR = ${KRBDIR}/../kerberosV KRB5SRC = ${KRB5DIR}/src CFLAGS += -DHAVE_CONFIG_H -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\" \ + -I${DESTDIR}/usr/include/kerberosV \ -I${DESTDIR}/usr/include/kerberosIV \ -I${KRBSRC}/include -I${KRBSRC}/lib/sl \ -I${KRB5SRC}/lib/roken -I${KRB5DIR}/include diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile index 1fe6cfefb58..ac950a9ac3a 100644 --- a/usr.bin/ssh/lib/Makefile +++ b/usr.bin/ssh/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2002/06/11 04:14:26 markus Exp $ +# $OpenBSD: Makefile,v 1.36 2002/06/11 15:23:29 hin Exp $ .PATH: ${.CURDIR}/.. @@ -20,6 +20,10 @@ install: .include <bsd.own.mk> +.if (${KERBEROS5:L} == "yes") +CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV +.endif # KERBEROS5 + .if (${KERBEROS:L} == "yes") CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV .if (${AFS:L} == "yes") @@ -28,8 +32,4 @@ SRCS+= radix.c .endif # AFS .endif # KERBEROS -.if (${KERBEROS5:L} == "yes") -CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -.endif # KERBEROS5 - .include <bsd.lib.mk> |