diff options
| author | bde <bde@FreeBSD.org> | 1998-03-07 09:48:14 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-03-07 09:48:14 +0000 |
| commit | 2f15ee67243320d906c911e1d8c24806b7bc4ed2 (patch) | |
| tree | 27d20d840bd963137595575216ed329966f11e6a /usr.sbin/cron | |
| parent | adad8e3b30af68187200b507357e3fcf43100f33 (diff) | |
| download | FreeBSD-src-2f15ee67243320d906c911e1d8c24806b7bc4ed2.zip FreeBSD-src-2f15ee67243320d906c911e1d8c24806b7bc4ed2.tar.gz | |
Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.
Get the default BINDIR correctly (by including ../Makefile.inc recursively.
Override the default it it is wrong.
Don't override defaults when the defaults are correct.
Diffstat (limited to 'usr.sbin/cron')
| -rw-r--r-- | usr.sbin/cron/cron/Makefile | 19 | ||||
| -rw-r--r-- | usr.sbin/cron/crontab/Makefile | 18 |
2 files changed, 8 insertions, 29 deletions
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index 81c1df1..e52d31d 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,21 +1,10 @@ -BINDIR?= /usr/sbin +# $Id$ PROG= cron SRCS= cron.c database.c do_command.c job.c user.c popen.c -MAN8= cron.8 - CFLAGS+=-DLOGIN_CAP - -.if exists(${.OBJDIR}/../lib) -LDADD+= -L${.OBJDIR}/../lib -DPADD+= ${.OBJDIR}/../lib/libcron.a -.else -LDADD+= -L${.CURDIR}/../lib -DPADD+= ${.CURDIR}/../lib/libcron.a -.endif -LDADD+= -lcron - -LDADD+= -lutil -DPADD+= ${LIBUTIL} +DPADD= ${LIBCRON} ${LIBUTIL} +LDADD= ${LIBCRON} -lutil +MAN8= cron.8 .include <bsd.prog.mk> diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile index 41c455f..99b6712 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,23 +1,13 @@ -BINDIR?= /usr/bin +# $Id$ PROG= crontab -SRCS= crontab.c CFLAGS+=-I${.CURDIR}/../cron +DPADD= ${LIBCRON} ${LIBUTIL} +LDADD= ${LIBCRON} -lutil MAN1= crontab.1 MAN5= crontab.5 -.if exists(${.OBJDIR}/../lib) -LDADD+= -L${.OBJDIR}/../lib -DPADD+= ${.OBJDIR}/../lib/libcron.a -.else -LDADD+= -L${.CURDIR}/../lib -DPADD+= ${.CURDIR}/../lib/libcron.a -.endif -LDADD+= -lcron - -LDADD+= -lutil -DPADD+= ${LIBUTIL} - +BINDIR= /usr/bin BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg |
