From ee084b4baf8d84c6793da2900235f815e38b9ded Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Sat, 9 Feb 2013 23:17:28 +0000
Subject: 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
---
 Makefile.inc1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile.inc1')

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
-- 
cgit v1.1