summaryrefslogtreecommitdiff
path: root/secure
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2000-02-28 19:25:34 +0000
committerMark Murray <markm@FreeBSD.org>2000-02-28 19:25:34 +0000
commite1eaf14cd7f9b9c9c95d5daee822911a2d18a890 (patch)
treee6511cb05094aa32f5483f7e48f9180e5c9a4a91 /secure
parentc62e13f4cf8d9b9ad4efc4aa7f3ece639c026143 (diff)
Notes
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile3
-rw-r--r--secure/usr.bin/ssh/Makefile6
-rw-r--r--secure/usr.sbin/sshd/Makefile6
3 files changed, 11 insertions, 4 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 6824189b8b53..42190a97e423 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -226,6 +226,9 @@ afterinstall:
@cd ${DESTDIR}${LIBDIR}; \
rm -f libdes.a; \
ln -sf lib${LIB}.a libdes.a
+ @cd ${DESTDIR}${INCDIR}; \
+ rm -f des.h; \
+ ln -sf openssh/des.h
.if !defined(NOPROFILE)
@cd ${DESTDIR}${LIBDIR}; \
rm -f libdes_p.a; \
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 33887f9ed5e6..faef668249e0 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -19,6 +19,7 @@ SRCS= ssh.c sshconnect.c log-client.c readconf.c clientloop.c
.if defined(MAKE_KERBEROS4) && \
((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
+DISTRIBUTION=krb4
CFLAGS+= -DKRB4
LDADD+= -lkrb -lcom_err
DPADD+= ${LIBKRB} ${LIBCOM_ERR}
@@ -26,9 +27,10 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5) && \
((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
+DISTRIBUTION=krb5
CFLAGS+= -DKRB5
-LDADD+= -lkrb5 -lcom_err
-DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
+LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
+DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBKAFS} ${LIBASN1} ${LIBMD}
.endif # MAKE_KERBEROS5
.include <bsd.prog.mk>
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index a0e4fac15a96..47f1349166a7 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -19,6 +19,7 @@ CFLAGS= -DLIBWRAP
.if defined(MAKE_KERBEROS4) && \
((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
+DISTRIBUTION=krb4
CFLAGS+= -DKRB4
SRCS+= auth-krb4.c
LDADD+= -lkrb -lcom_err
@@ -27,10 +28,11 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5) && \
((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES"))
+DISTRIBUTION=krb5
CFLAGS+= -DKRB5
SRCS+= auth-krb5.c
-LDADD+= -lkrb5 -lcom_err
-DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
+LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
+DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBKAFS} ${LIBASN1} ${LIBMD}
.endif # MAKE_KERBEROS5
.include <bsd.prog.mk>