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

5 files changed, 29 insertions, 31 deletions

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