From ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4 Mon Sep 17 00:00:00 2001 From: ru Date: Mon, 26 Mar 2001 14:53:33 +0000 Subject: secure/ build fixes: - TELNETOBJDIR is gone. `buildworld' already installs libtelnet.a in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there. - SSHDIR (formerly SSHSRC) is now shared between all SSH modules. New LIBSSH is introduced for libssh.a (an internal static lib). Previously, build without prior `obj' was broken; SSH modules always looked for libssh.a in ${.OBJDIR}. Also, the dependancies on the libssh.a were missing. - libtelnet/ did not install the crypto version of telnet.h into /usr/include/arpa. - Removed BINOWN, BINMODE, BINDIR and SRCS with default values. Reviewed by: markm - MAN[1-9] -> MAN. --- secure/usr.bin/ssh-agent/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'secure/usr.bin/ssh-agent') diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 901f09e..bf9cfd6 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,18 +1,12 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - PROG= ssh-agent -BINOWN= root -BINMODE=555 -MAN= ssh-agent.1 - SRCS= ssh-agent.c log-client.c -.include +LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -.PATH: ${SSHSRC} +.include -LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +.PATH: ${SSHDIR} -- cgit v1.1