Re: make release broken [FIX]

On Tue, Jul 22, 2003 at 07:42:33PM +0300, Ruslan Ermilov wrote:
> Hi!
> 
> As many of you probably know, recent telnet commit broke snapshot
> building.  Since I needed a working "make release" to go on with
> my task on floppy-less "make release" (for AMD64, etc.), I had to
> just fix it.  Attached is the patch.  It also fixes another issue
> with this telnet commit: it ensures that crypto telnet[d] do not
> end up in the "base" distribution.
> 
Missed in the patch: set DISTRIBUTION=crypto in lib/libtelnet/Makefile,
so that we still have crypto/usr/include/arpa/telnet.h.

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libtelnet/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	20 Jul 2003 23:29:46 -0000	1.16
+++ Makefile	23 Jul 2003 06:37:09 -0000
_at__at_ -13,10 +13,11 _at__at_
 
 WARNS?=		2
 
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION=	crypto
 SRCS+=		encrypt.c auth.c enc_des.c sra.c pk.c
 CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
 SRCS+=		kerberos5.c
 CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
 CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write
%%%


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru_at_sunbay.com		Sunbay Software Ltd,
ru_at_FreeBSD.org		FreeBSD committer