summaryrefslogtreecommitdiffstats
path: root/usr.sbin/cron
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1994-08-29 18:42:12 +0000
committerjkh <jkh@FreeBSD.org>1994-08-29 18:42:12 +0000
commit4e29f11c60984a5603dc95aa4c09817cf5ca0db8 (patch)
tree78673db599b4a50b0ce1c65e533e8b69d0a34a44 /usr.sbin/cron
parent5bf16575e5e14608bc6c498303b5310b239ede59 (diff)
downloadFreeBSD-src-4e29f11c60984a5603dc95aa4c09817cf5ca0db8.zip
FreeBSD-src-4e29f11c60984a5603dc95aa4c09817cf5ca0db8.tar.gz
Use LDDESTDIR and DPADD more consistently with what Bruce suggests..
Submitted by: jkh
Diffstat (limited to 'usr.sbin/cron')
-rw-r--r--usr.sbin/cron/cron/Makefile10
-rw-r--r--usr.sbin/cron/crontab/Makefile8
2 files changed, 13 insertions, 5 deletions
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index bf9cf0e..09cde80 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -5,10 +5,14 @@ SRCS= cron.c database.c do_command.c job.c user.c popen.c
MAN3= bitstring.3
MAN8= cron.8
-.if exists({.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj -lcron
+.if exists(${.CURDIR}/../lib/obj)
+LDDESTDIR+= -L${.CURDIR}/../lib/obj
+DPADD+= ${.CURDIR}/../lib/obj/libcron.a
.else
-LDADD+= -L${.CURDIR}/../lib -lcron
+LDDESTDIR+= -L${.CURDIR}/../lib
+DPADD+= ${.CURDIR}/../lib/libcron.a
.endif
+LDADD+= -lcron
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index e3fe3e5..f8337b2 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -7,9 +7,13 @@ MAN1= crontab.1
MAN5= crontab.5
.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj -lcron
+LDDESTDIR+= -L${.CURDIR}/../lib/obj
+DPADD+= ${.CURDIR}/../lib/obj/libcron.a
.else
-LDADD+= -L${.CURDIR}/../lib -lcron
+LDDESTDIR+= -L${.CURDIR}/../lib
+DPADD+= ${.CURDIR}/../lib/libcron.a
.endif
+LDADD+= -lcron
+
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud