svn commit: r314676 - in head/usr.sbin/amd: amd libamu

[Ngie Cooper]

Author: ngie
Date: Sat Mar  4 20:35:34 2017
New Revision: 314676
URL: https://svnweb.freebsd.org/changeset/base/314676

Log:
  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

Modified:
  head/usr.sbin/amd/amd/Makefile
  head/usr.sbin/amd/libamu/Makefile

Modified: head/usr.sbin/amd/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/amd/Makefile	Sat Mar  4 20:06:47 2017	(r314675)
+++ head/usr.sbin/amd/amd/Makefile	Sat Mar  4 20:35:34 2017	(r314676)
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 .PATH:	${SRCTOP}/contrib/amd/amd
 

Modified: head/usr.sbin/amd/libamu/Makefile
==============================================================================
--- head/usr.sbin/amd/libamu/Makefile	Sat Mar  4 20:06:47 2017	(r314675)
+++ head/usr.sbin/amd/libamu/Makefile	Sat Mar  4 20:35:34 2017	(r314676)
@@ -5,6 +5,8 @@
 #
 # $FreeBSD$
 
+.include <bsd.init.mk>
+
 .PATH:	${SRCTOP}/contrib/amd/libamu \
 	${SRCTOP}/contrib/amd/conf/transp \
 	${SRCTOP}/contrib/amd/conf/mtab \