diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2009-03-13 10:09:08 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2009-03-13 10:09:08 +0000 |
| commit | 555aaddf22dfd40ebafffe314fecaeae0415a036 (patch) | |
| tree | 754a6aa8e6d5b993883946d923e541f102410d18 /Makefile.inc1 | |
| parent | e81879a123d08f58c5a6e56ab22eaa84c8d12643 (diff) | |
| download | src-test2-555aaddf22dfd40ebafffe314fecaeae0415a036.tar.gz src-test2-555aaddf22dfd40ebafffe314fecaeae0415a036.zip | |
Don't put "install-info" to the list of install-tools if we're
installing with -DWITHOUT_INFO, otherwise one can experience a
failure trying to installworld on a system that is built with
-DWITHOUT_INFO (i.e., without /usr/bin/install-info).
Reported by: bland
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=189764
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 53471d0f40c9..a74db4b5e02b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -612,8 +612,12 @@ installcheck_UGID: # # Required install tools to be saved in a scratch dir for safety. # +.if ${MK_INFO} != "no" +_install-info= install-info +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - 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 \ test true uname wc zic |