Don't use LDDESTDIR. Just put the -L arg in LDADD.

7 files changed, 31 insertions, 34 deletions

diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index daeb274..e8a0c54 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -8,7 +8,6 @@ LIBDESTDIR=	${.OBJDIR}/../lib
 LIBDESTDIR=	${.CURDIR}/../lib
 .endif
 
-LDDESTDIR=	-L${LIBDESTDIR}
 LIBCVS=		${LIBDESTDIR}/libcvs.a
 
 .if exists(${.CURDIR}/../../Makefile.inc)
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index b254599..4ec4847 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1997/05/15 23:00:05 peter Exp $
+#	$Id: Makefile,v 1.18 1997/10/10 04:03:17 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -22,7 +22,7 @@ SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -I${CVSDIR}/src -I${CVSDIR}/lib -DHAVE_CONFIG_H
 
 DPADD+=	${LIBCVS} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD+=	-lcvs -lgnuregex -lmd -lcrypt -lz
+LDADD+=	-L${LIBDESTDIR} -lcvs -lgnuregex -lmd -lcrypt -lz
 
 .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index ddb06a8..81c1df1 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -7,16 +7,15 @@ MAN8=	cron.8
 CFLAGS+=-DLOGIN_CAP
 
 .if exists(${.OBJDIR}/../lib)
-LDDESTDIR+=	-L${.OBJDIR}/../lib
+LDADD+=	-L${.OBJDIR}/../lib
 DPADD+=	${.OBJDIR}/../lib/libcron.a
 .else
-LDDESTDIR+=	-L${.CURDIR}/../lib
+LDADD+=	-L${.CURDIR}/../lib
 DPADD+=	${.CURDIR}/../lib/libcron.a
 .endif
+LDADD+=	-lcron
 
-LDADD+= -lcron
-
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
+LDADD+=	-lutil
+DPADD+=	${LIBUTIL}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 1c9a486..41c455f 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -2,24 +2,23 @@ BINDIR?=	/usr/bin
 
 PROG=	crontab
 SRCS=	crontab.c
-CFLAGS+= -I${.CURDIR}/../cron
+CFLAGS+=-I${.CURDIR}/../cron
 MAN1=	crontab.1
 MAN5=	crontab.5
 
 .if exists(${.OBJDIR}/../lib)
-LDDESTDIR+=	-L${.OBJDIR}/../lib
+LDADD+=	-L${.OBJDIR}/../lib
 DPADD+=	${.OBJDIR}/../lib/libcron.a
 .else
-LDDESTDIR+=	-L${.CURDIR}/../lib
+LDADD+=	-L${.CURDIR}/../lib
 DPADD+=	${.CURDIR}/../lib/libcron.a
 .endif
-
 LDADD+=	-lcron
 
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
+LDADD+=	-lutil
+DPADD+=	${LIBUTIL}
 
-BINOWN= root
+BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile
index 9754fd7..2d7bf2f 100644
--- a/usr.sbin/mrouted/map-mbone/Makefile
+++ b/usr.sbin/mrouted/map-mbone/Makefile
@@ -1,18 +1,18 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 16:07:26 peter Exp $
 
 PROG=	map-mbone
 
 S=	${.CURDIR}/..
 .PATH:	$S
 CFLAGS+=	-I$S
-LDADD+=	-lmrouted
 .if exists(${.OBJDIR}/../common)
-LDDESTDIR+=	-L${.OBJDIR}/../common
-DPADD+= 	${.OBJDIR}/../common/libmrouted.a
+LDADD+=	-L${.OBJDIR}/../common
+DPADD+=	${.OBJDIR}/../common/libmrouted.a
 .else
-LDDESTDIR+=	-L$S/common
-DPADD+=		$S/common/libmrouted.a
+LDADD+=	-L$S/common
+DPADD+=	$S/common/libmrouted.a
 .endif
+LDADD+=	-lmrouted
 
 SRCS=	mapper.c
 MAN8=	${.CURDIR}/../map-mbone.8
diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile
index 96b2f05..606a9fd 100644
--- a/usr.sbin/mrouted/mrinfo/Makefile
+++ b/usr.sbin/mrouted/mrinfo/Makefile
@@ -1,18 +1,18 @@
-#	$Id$
+#	$Id: Makefile,v 1.7 1997/02/22 16:07:29 peter Exp $
 
 PROG=	mrinfo
 
 S=	${.CURDIR}/..
 .PATH:	$S
 CFLAGS+=	-I$S
-LDADD+=	-lmrouted
 .if exists(${.OBJDIR}/../common)
-LDDESTDIR+=	-L${.OBJDIR}/../common
-DPADD+= 	${.OBJDIR}/../common/libmrouted.a
+LDADD+=	-L${.OBJDIR}/../common
+DPADD+= ${.OBJDIR}/../common/libmrouted.a
 .else
-LDDESTDIR+=	-L$S/common
-DPADD+=		$S/common/libmrouted.a
+LDADD+=	-L$S/common
+DPADD+=	$S/common/libmrouted.a
 .endif
+LDADD+=	-lmrouted
 
 SRCS=	mrinfo.c
 MAN8=	${.CURDIR}/../mrinfo.8
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index 532ff93..eb310f7 100644
--- a/usr.sbin/mrouted/mrouted/Makefile
+++ b/usr.sbin/mrouted/mrouted/Makefile
@@ -1,18 +1,18 @@
-#	$Id$
+#	$Id: Makefile,v 1.6 1997/02/22 16:07:34 peter Exp $
 
 PROG=	mrouted
 
 S=	${.CURDIR}/..
 .PATH:	$S
 CFLAGS+=	-I$S
-LDADD+=	-lmrouted
 .if exists(${.OBJDIR}/../common)
-LDDESTDIR+=	-L${.OBJDIR}/../common
-DPADD+= 	${.OBJDIR}/../common/libmrouted.a
+LDADD+=	-L${.OBJDIR}/../common
+DPADD+= ${.OBJDIR}/../common/libmrouted.a
 .else
-LDDESTDIR+=	-L$S/common
-DPADD+=		$S/common/libmrouted.a
+LDADD+=	-L$S/common
+DPADD+=	$S/common/libmrouted.a
 .endif
+LDADD+=	-lmrouted
 
 SRCS=	config.c cfparse.y main.c route.c vif.c prune.c callout.c rsrr.c
 CLEANFILES+= y.tab.h