Author: brooks
Date: Sat Feb 9 23:17:28 2013
New Revision: 246602
URL: http://svnweb.freebsd.org/changeset/base/246602
Log:
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
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Feb 9 21:36:14 2013 (r246601)
+++ head/Makefile.inc1 Sat Feb 9 23:17:28 2013 (r246602)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
