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.

1 files changed, 9 insertions, 6 deletions

diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index f4968b8..ca5d1f4 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -4,12 +4,6 @@ DISTRIBUTION?=crypto
 
 TELNETDIR=	${.CURDIR}/../../../crypto/telnet
 
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-TELNETOBJDIR=	${.OBJDIR}/../../lib/libtelnet
-.else
-TELNETOBJDIR=	${.CURDIR}/../../lib/libtelnet
-.endif
-
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
 .else
@@ -19,3 +13,12 @@ CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
 .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
 CFLAGS+= -DNO_IDEA
 .endif
+
+.if !defined(NO_OPENSSH)
+SSHDIR=		${.CURDIR}/../../../crypto/openssh
+.if exists(${.OBJDIR}/../../lib/libssh)
+LIBSSH=		${.OBJDIR}/../../lib/libssh/libssh.a
+.else
+LIBSSH=		${.CURDIR}/../../lib/libssh/libssh.a
+.endif
+.endif