diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-29 10:15:41 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-29 10:15:41 +0000 |
| commit | 596e393e206fc34af6280cabd17ea693c40f1eeb (patch) | |
| tree | 3d410c05ba77473c455616c3911ff0dcaf2015a6 /usr.sbin/ctm | |
| parent | f3f97b84ed16d2b090712f6f6182bd3e48684f3a (diff) | |
| download | FreeBSD-src-596e393e206fc34af6280cabd17ea693c40f1eeb.zip FreeBSD-src-596e393e206fc34af6280cabd17ea693c40f1eeb.tar.gz | |
MFC r314659,r314676:
r314659:
usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output
r314676:
Fix build after r314656
Some of the changes I introduced to use .ALLSRC were correct in spirit,
but incorrect in reality -- in particular, ../Makefile.inc hadn't been
pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value
of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk
explicitly so we can be certain that the values used as dependencies in
the targets are defined when the target recipe has been evaluated.
Reminder: thou shalt separate out separate functional changes before
committing them.
(YUGE) Pointyhat to: ngie
In collaboration with: bdrewery
Diffstat (limited to 'usr.sbin/ctm')
| -rw-r--r-- | usr.sbin/ctm/Makefile.inc | 4 | ||||
| -rw-r--r-- | usr.sbin/ctm/ctm/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/ctm/ctm_dequeue/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/ctm/ctm_smail/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc index c6c2c5a..78adccb 100644 --- a/usr.sbin/ctm/Makefile.inc +++ b/usr.sbin/ctm/Makefile.inc @@ -1,5 +1,5 @@ # $FreeBSD$ -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile index dd27ed2..5f72f05 100644 --- a/usr.sbin/ctm/ctm/Makefile +++ b/usr.sbin/ctm/ctm/Makefile @@ -18,7 +18,7 @@ LIBADD= md WARNS?= 2 -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" +.if exists(${.CURDIR:H:H}/Makefile.inc) +.include "${.CURDIR:H:H}/Makefile.inc" .endif .include <bsd.prog.mk> diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile index d2f5648..cbc7f0c 100644 --- a/usr.sbin/ctm/ctm_dequeue/Makefile +++ b/usr.sbin/ctm/ctm_dequeue/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ctm_rmail +.PATH: ${.CURDIR:H}/ctm_rmail PROG= ctm_dequeue MAN= SRCS= ctm_dequeue.c error.c -CFLAGS+= -I${.CURDIR}/../ctm_rmail +CFLAGS+= -I${.CURDIR:H}/ctm_rmail WARNS?= 1 diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile index 4c98d31..88e8c21 100644 --- a/usr.sbin/ctm/ctm_smail/Makefile +++ b/usr.sbin/ctm/ctm_smail/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ctm_rmail +.PATH: ${.CURDIR:H}/ctm_rmail PROG= ctm_smail MAN= SRCS= ctm_smail.c error.c -CFLAGS+= -I${.CURDIR}/../ctm_rmail +CFLAGS+= -I${.CURDIR:H}/ctm_rmail WARNS?= 2 |
