Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unlike other domestic bits, telnet and telnetd are never built as a part

Browse Source 
of the domestic build process.  No domestic program actually builds its
own man pages but instead relies on those built in the exportable tree.
The result is missing telnet(1) and telnet(8) pages.

Fix this problem descending into the telnet and telnetd directories
regardless of whether we're doing an exportable build or not.  Once there,
we generate only the man pages if we're building a non-exportable system.
This commit is contained in:
scottr 1998-07-22 22:30:07 +00:00
parent 202d438148
commit 8f01a044f4
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libexec/Makefile
View File

@ -1,18 +1,11 @@
# $NetBSD: Makefile,v 1.28 1998/03/28 00:53:09 cgd Exp $
# $NetBSD: Makefile,v 1.29 1998/07/22 22:30:07 scottr Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk> # for EXPORTABLE_SYSTEM
SUBDIR= atrun comsat fingerd ftpd getNAME getty identd ld.elf_so lfs_cleanerd \
mail.local makekey makewhatis rexecd rlogind rmail rshd rpc.rquotad \
rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd talkd \
rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd talkd telnetd \
tftpd uucpd
# XXX Keep telnetd(8) and libtelnet from getting out of sync during the build
# XXX process.
.if !exists(${.CURDIR}/../domestic/libexec/telnetd) || \
defined(EXPORTABLE_SYSTEM) || make(clean) || make(cleandir)
SUBDIR+=telnetd
.endif
.include <bsd.subdir.mk>

15
libexec/telnetd/Makefile
View File

@ -1,6 +1,13 @@
# $NetBSD: Makefile,v 1.11 1997/10/22 06:15:59 lukem Exp $
# $NetBSD: Makefile,v 1.12 1998/07/22 22:30:07 scottr Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
MAN= telnetd.8
# XXX Keep telnetd(8) and libtelnet from getting out of sync during the build
# XXX process.
.if !exists(${.CURDIR}/../../domestic/libexec/telnetd) || \
defined(EXPORTABLE_SYSTEM) || make(clean) || make(cleandir)
PROG= telnetd
CPPFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
CPPFLAGS+=-DOLD_ENVIRON -DENV_HACK -I${.CURDIR}
@ -9,10 +16,12 @@ SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD+= -lutil -ltermcap -ltelnet
MAN= telnetd.8
.include <bsd.prog.mk>
.else # EXPORTABLE_SYSTEM
.include <bsd.man.mk>
.endif # EXPORTABLE_SYSTEM
nocrypt:
@echo "Encryption code already removed."

11
usr.bin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.83 1998/07/13 11:14:03 augustss Exp $
# $NetBSD: Makefile,v 1.84 1998/07/22 22:30:07 scottr Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk> # for EXPORTABLE_SYSTEM definition
@ -19,7 +19,7 @@ SUBDIR= apply apropos asa at audioctl banner basename bdes \
renice rev rlogin rpcgen rpcinfo rs rsh rup \
ruptime rusers rwall rwho script sed shar shlock \
showmount skey skeyinfo skeyinit soelim split \
su systat tail talk tcopy tee tftp time \
su systat tail talk tcopy tee telnet tftp time \
tip tn3270 touch tput tr true tset tsort tty ul \
uname unexpand unifdef uniq units unvis usbhidctl users \
uudecode uuencode vacation vgrind vi vis vmstat w \
@ -31,13 +31,6 @@ SUBDIR= apply apropos asa at audioctl banner basename bdes \
SUBDIR+=elf2aout elf2ecoff elfstrip fdformat ldd strip telnet
.else
# XXX Keep telnet(1) and libtelnet from getting out of sync during the build
# XXX process.
.if !exists(${.CURDIR}/../domestic/usr.bin/telnet) || \
defined(EXPORTABLE_SYSTEM)
SUBDIR+=telnet
.endif
# Don't use the standard a.out tool chain on non-aout (ELF) platforms.
# On ELF platforms, build the ELF ldd.
.if (${OBJECT_FMT} != "ELF")

15
usr.bin/telnet/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 1998/02/27 10:44:12 christos Exp $
# $NetBSD: Makefile,v 1.11 1998/07/22 22:31:29 scottr Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@ -34,6 +34,11 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
#
# XXX Keep telnet(1) and libtelnet from getting out of sync during the build
# XXX process.
.if !exists(${.CURDIR}/../../domestic/usr.bin/telnet) || \
defined(EXPORTABLE_SYSTEM) || make(clean) || make(cleandir)
PROG= telnet
CPPFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -Dunix
@ -53,5 +58,13 @@ NOCRYPT_DIR=${.CURDIR}/Nocrypt
.include <bsd.prog.mk>
.else # EXPORTABLE_SYSTEM
MAN= telnet.1
.include <bsd.man.mk>
.endif # EXPORTABLE_SYSTEM
nocrypt:
@echo "Encryption code already removed."