diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-05-29 10:15:41 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-05-29 10:15:41 +0000 |
| commit | ca4fd5a3360726c9964a53011caf371a6a438ff7 (patch) | |
| tree | 3d410c05ba77473c455616c3911ff0dcaf2015a6 /usr.sbin/makemap | |
| parent | 857f1bdacde021651d136d7966bd2da1095c354a (diff) | |
| download | src-ca4fd5a3360726c9964a53011caf371a6a438ff7.tar.gz src-ca4fd5a3360726c9964a53011caf371a6a438ff7.zip | |
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
Notes
Notes:
svn path=/stable/11/; revision=319119
Diffstat (limited to 'usr.sbin/makemap')
| -rw-r--r-- | usr.sbin/makemap/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index af5f742ac9b2..2477060b7937 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap PROG= makemap |