From 1567e131406683d0071e98b4e080bc3ec90cf005 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Wed, 18 Sep 2013 00:33:24 +0000
Subject: Fix 'make installcheck' to check for missing UID/GID as well, broken
 since r249893, by adding a separate _installcheck_world and
 _installcheck_kernel so the destination targets can be more explicit on which
 they are needed for.

installcheck will call both, while installworld only calls
_installcheck_world and installkernel only calls _installcheck_kernel

While here, mark the internal targets as starting with _.

Reported by:	des
Reviewed by:	des
Pointyhat to:	bdrewery
Approved by:	re (delphij)
---
 Makefile.inc1 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 52fc84b..c231541 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -676,8 +676,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
-installcheck:
-installcheck_UGID:
+installcheck: _installcheck_world _installcheck_kernel
+_installcheck_world:
+_installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -686,8 +687,9 @@ installcheck_UGID:
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
-installcheck: installcheck_DESTDIR
-installcheck_DESTDIR:
+_installcheck_world: __installcheck_DESTDIR
+_installcheck_kernel: __installcheck_DESTDIR
+__installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
@@ -713,7 +715,8 @@ CHECK_GIDS+=	proxy authpf
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
 .endif
-installcheck_UGID:
+_installcheck_world: __installcheck_UGID
+__installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@@ -768,7 +771,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck installcheck_UGID
+distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -1046,7 +1049,7 @@ buildkernel:
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: installcheck
+reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
-- 
cgit v1.1