diff options
author | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
commit | ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4 (patch) | |
tree | 0db60fb94584b564904c50e18e3ff4f05eb4cdcb /secure/Makefile.inc | |
parent | 0c5874752b9906c2928c57de2a78a6a5fb277673 (diff) | |
download | FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.zip FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.tar.gz |
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.
Diffstat (limited to 'secure/Makefile.inc')
-rw-r--r-- | secure/Makefile.inc | 15 |
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 |