From de0d6977f94492b5e0c6f864c8f451b86aabee74 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Thu, 11 Apr 2002 08:54:21 +0000
Subject: [PATCH] Really finish the removal of ${LDDESTDIR} in bsd.lib.mk,v
 1.55. bsd.lib.mk,v 1.101 only did that partly.

---
 share/mk/bsd.obj.mk  | 2 +-
 share/mk/bsd.prog.mk | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 720b2fe1fbef..79ac5167220d 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -144,7 +144,7 @@ checkdpadd:
 		echo "LDADD -> $$ldadd1" ; \
 	fi
 .else
-	@dpadd=`echo \`ld -Bstatic -f ${LDDESTDIR} ${LDADD}\`` ; \
+	@dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \
 	if [ "$$dpadd" != "${DPADD}" ] ; then \
 		echo ${.CURDIR} ; \
 		echo "LDADD -> $$dpadd" ; \
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 4163118f058b..7daaad9b427a 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -32,7 +32,7 @@ LDADD+=	${OBJCLIBS}
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
 ${PROG}: ${OBJS}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 
 .else !defined(SRCS)
 
@@ -47,7 +47,7 @@ SRCS=	${PROG}.c
 OBJS=	${PROG}.o
 
 ${PROG}: ${OBJS}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .endif
 
 .endif
@@ -74,7 +74,7 @@ CLEANFILES+= ${PROG} ${OBJS}
 .if defined(PROG)
 _EXTRADEPEND:
 .if ${OBJFORMAT} == aout
-	echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \
+	echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \
 	    ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE}
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}