diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 20:35:34 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 20:35:34 +0000 |
| commit | 81a687a7ff23462db5b1cd93d1a950050b3564a7 (patch) | |
| tree | 83b3855919d73e52b5c0e32b0c99247b747c61e3 | |
| parent | e0db0ddb3983c06baef37841de2b4a8d2a0d0288 (diff) | |
| download | src-81a687a7ff23462db5b1cd93d1a950050b3564a7.tar.gz src-81a687a7ff23462db5b1cd93d1a950050b3564a7.zip | |
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
MFC after: 1 month
Reported by: Jenkins, cy, ler, O. Hartmann, Michael Butler
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=314676
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/amd/libamu/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index db7196a28b5c..c1d5f4a295ff 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -.include <src.opts.mk> +.include <bsd.init.mk> .PATH: ${SRCTOP}/contrib/amd/amd diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index d204b84183f0..23534c821637 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -5,6 +5,8 @@ # # $FreeBSD$ +.include <bsd.init.mk> + .PATH: ${SRCTOP}/contrib/amd/libamu \ ${SRCTOP}/contrib/amd/conf/transp \ ${SRCTOP}/contrib/amd/conf/mtab \ |