[Midnightbsd-cvs] src [9346] trunk/Makefile.inc1: Fix installkernel requiring users/groups defined in CHECK_UIDS

[laffer1 at midnightbsd.org]

Revision: 9346
          http://svnweb.midnightbsd.org/src/?rev=9346
Author:   laffer1
Date:     2017-03-04 11:46:02 -0500 (Sat, 04 Mar 2017)
Log Message:
-----------
Fix installkernel requiring users/groups defined in CHECK_UIDS
  and CHECK_GIDS to exist since r152680. This is only needed for
  installworld. The documented procedure of running mergemaster -p
  to check for missing users is only needed for installworld, not
  for installkernel. This fixes auditdistd incorrectly being
  required for installkernel.

Obtained from: FreeBSD

Revision Links:
--------------
    http://svnweb.midnightbsd.org/src/?rev=152680

Modified Paths:
--------------
    trunk/Makefile.inc1

Modified: trunk/Makefile.inc1
===================================================================
--- trunk/Makefile.inc1	2017-03-04 16:45:15 UTC (rev 9345)
+++ trunk/Makefile.inc1	2017-03-04 16:46:02 UTC (rev 9346)
@@ -591,6 +591,7 @@
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck:
+installcheck_UGID:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -622,7 +623,6 @@
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck: installcheck_UGID
 installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
@@ -676,7 +676,7 @@
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif
 
-distributeworld installworld: installcheck
+distributeworld installworld: installcheck installcheck_UGID
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \