diff options
| author | emaste <emaste@FreeBSD.org> | 2007-10-15 13:50:46 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2007-10-15 13:50:46 +0000 |
| commit | be4cf9548f56375244247312102ae190a6753ecb (patch) | |
| tree | 7cf28fb8c91b1bed01f448b451ed57ce49c6bb29 | |
| parent | c44dc0d6393702c6bcf74f9504921665918da2b9 (diff) | |
| download | FreeBSD-src-be4cf9548f56375244247312102ae190a6753ecb.zip FreeBSD-src-be4cf9548f56375244247312102ae190a6753ecb.tar.gz | |
If a required install tool is missing, provide a more friendly error
message (instead of cp's usage info).
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ff8c924..e64fd4b 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} |
