make release broken [FIX]

Ruslan Ermilov ru at
Tue Jul 22 23:46:05 PDT 2003

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
@@ -13,10 +13,11 @@
 WARNS?=		2
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SRCS+=		encrypt.c auth.c enc_des.c sra.c pk.c
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
 SRCS+=		kerberos5.c
 CFLAGS+=	-DFORWARD -Dnet_write=telnet_net_write

Ruslan Ermilov		Sysadmin and DBA,
ru at		Sunbay Software Ltd,
ru at		FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url :

More information about the freebsd-current mailing list