From 4632fa4e065296ea290c0068288ff0fef1e2e161 Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Thu, 31 Jul 1997 06:12:04 +0000
Subject: 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
---
 share/mk/bsd.prog.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'share/mk/bsd.prog.mk')

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)
 
-- 
cgit v1.1