If a required install tool is missing, provide a more friendly error

message (instead of cp's usage info).
This commit is contained in:
Ed Maste 2007-10-15 13:50:46 +00:00
parent 4932c895e7
commit 1602894ecf

View File

@ -578,7 +578,12 @@ distributeworld installworld: installcheck
date echo egrep find grep install-info \ date echo egrep find grep install-info \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic; do \ 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 done
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
rm -rf ${INSTALLTMP} rm -rf ${INSTALLTMP}