diff options
| author | scottr <scottr@NetBSD.org> | 1998-07-22 22:30:07 +0000 |
|---|---|---|
| committer | scottr <scottr@NetBSD.org> | 1998-07-22 22:30:07 +0000 |
| commit | 8f01a044f4aa23d39bd5935d340bab34d44ac3a4 (patch) | |
| tree | d5d84b59e9cca777807d42c538f24512da1d4aac /libexec | |
| parent | 202d438148687d17ec86a121f3844a13eb50c597 (diff) | |
Unlike other domestic bits, telnet and telnetd are never built as a part
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.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/Makefile | 11 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index be5a8a55a68..5f180e20b5c 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -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> diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 4ca5783f735..72933f9b6c9 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -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." |
