diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1995-09-16 03:13:38 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1995-09-16 03:13:38 +0000 |
| commit | b03b5de644b90871d24090fcd20d141fdbc8827e (patch) | |
| tree | 5c39aaed83b68ca9849f8f1b382a9ee27516f116 /secure/libexec | |
| parent | a7c3514299bb93576b9ebf3062859e40e5dc79c9 (diff) | |
Merge with Head:
Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries. This makes
secure reference the libraries that were just built instead of in /usr/lib.
Notes
svn path=/stable/2.1/; revision=10815
Diffstat (limited to 'secure/libexec')
| -rw-r--r-- | secure/libexec/Makefile.inc | 4 | ||||
| -rw-r--r-- | secure/libexec/telnetd/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index 6657676abc6f..26d868c39153 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id: Makefile,v 1.2 1995/07/25 14:03:35 mark Exp $ +# $Id: Makefile.inc,v 1.2 1995/07/29 12:49:22 markm Exp $ BINDIR?= /usr/libexec + +.include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 977271d6ec2f..0bd111c5b9f6 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -9,8 +9,8 @@ MAN8= telnetd.8 SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} -LDADD= -lutil -ltermcap -ltelnet +DPADD= ${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP} +LDADD= -L${TELNETOBJDIR} -lutil -ltermcap -ltelnet CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK CFLAGS+=-I${.CURDIR}/../../lib |