diff options
| author | brooks <brooks@FreeBSD.org> | 2013-02-09 23:17:28 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-02-09 23:17:28 +0000 |
| commit | ee084b4baf8d84c6793da2900235f815e38b9ded (patch) | |
| tree | fe12d95d9926c2b4a156a49aa1701dcf3fcfab20 /Makefile.inc1 | |
| parent | 60b23e8e0bab5d58d92668ee96edaff5e2fbaa62 (diff) | |
| download | FreeBSD-src-ee084b4baf8d84c6793da2900235f815e38b9ded.zip FreeBSD-src-ee084b4baf8d84c6793da2900235f815e38b9ded.tar.gz | |
Add nmtree to ITOOLS if it is installed on the host instead of keying off
the BOOTSTRAPPING variable. The previous test was wrong because
BOOTSTRAPPING is 0 in most cases.
Tested by: db
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 771f852..bcb9487 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -673,6 +673,10 @@ _install-info= install-info _zoneinfo= zic tzsetup .endif +.if exists(/usr/sbin/nmtree) +_nmtree_itools= nmtree +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ @@ -1134,8 +1138,6 @@ _yacc= usr.bin/yacc .if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree -.else -_nmtree_itools= nmtree .endif .if ${BOOTSTRAPPING} < 1000027 |
