From 1602894ecfdf7e57fa45cdc2df6e3313a1177db6 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 15 Oct 2007 13:50:46 +0000
Subject: [PATCH] If a required install tool is missing, provide a more
 friendly error message (instead of cp's usage info).

---
 Makefile.inc1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index ff8c92483342..e64fd4b47387 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -578,7 +578,12 @@ distributeworld installworld: installcheck
 	    date echo egrep find grep install-info \
 	    ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
 	    test true uname wc zic; do \
-		cp `which $$prog` ${INSTALLTMP}; \
+		if progpath=`which $$prog`; then \
+			cp $$progpath ${INSTALLTMP}; \
+		else \
+			echo "Required install tool $$prog not found" >&2; \
+			exit 1; \
+		fi; \
 	done
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
 	rm -rf ${INSTALLTMP}