diff options
| author | asami <asami@FreeBSD.org> | 1997-07-31 06:12:04 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-07-31 06:12:04 +0000 |
| commit | 4632fa4e065296ea290c0068288ff0fef1e2e161 (patch) | |
| tree | 21b9071eba86c5a85332775f418ad0153e975722 /share/mk/bsd.prog.mk | |
| parent | d5139f57085f2e00c6d2032d7c8e8960a014fa9a (diff) | |
| download | FreeBSD-src-4632fa4e065296ea290c0068288ff0fef1e2e161.zip FreeBSD-src-4632fa4e065296ea290c0068288ff0fef1e2e161.tar.gz | |
Do not set the application variable LDDESTDIR. Note that it is still honored
in a few places (in bsd.lib.mk and bsd.prog.mk); this merely fixed part of
the brokenness by not setting it here.
This fixes building of secure telnetd when DESTDIR is defined.
(Otherwise, it will try to link libtelnet from ${DESTDIR}/usr/lib.)
Reviewed by: bde, jkh
Diffstat (limited to 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 7edf5c2..8e39cd4 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.51 1997/06/21 15:40:33 jkh Exp $ +# $Id: bsd.prog.mk,v 1.52 1997/06/28 08:14:10 pst Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -21,11 +21,6 @@ STRIP?= -s LDFLAGS+= -static .endif -.if defined(DESTDIR) -LDDESTDIR?= -L${DESTDIR}${SHLIBDIR} -L${DESTDIR}/usr/lib -# LDDESTDIR+= -nostdlib -.endif - .if defined(PROG) .if defined(SRCS) |
