diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2013-01-29 21:48:10 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2013-01-29 21:48:10 +0000 |
| commit | beb7ecad2b4209201e99def95020d704c9ffa074 (patch) | |
| tree | 5f95e8534bd65360c5cb91dce8dca33599d17f41 /Makefile.inc1 | |
| parent | 1910bfcba2e6829eb574b4ee5a600581b9306651 (diff) | |
| download | src-test2-beb7ecad2b4209201e99def95020d704c9ffa074.tar.gz src-test2-beb7ecad2b4209201e99def95020d704c9ffa074.zip | |
Fix installworld when nmtree is not on the host by only adding it to
ITOOLS when we will be using the host copy.
Fix installkernel when -DNO_ROOT is set.
Notes
Notes:
svn path=/head/; revision=246096
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4b9019107c83..cbf10ea2a9c8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -673,8 +673,8 @@ _zoneinfo= zic tzsetup ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ - ln lockf make mkdir mtree mv nmtree pwd_mkdb rm sed sh sysctl \ - test true uname wc ${_zoneinfo} + ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ + rm sed sh sysctl test true uname wc ${_zoneinfo} # # distributeworld @@ -964,7 +964,7 @@ reinstallkernel reinstallkernel.debug: installcheck @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ - ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} + ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} distributekernel distributekernel.debug: .if empty(INSTALLKERNEL) @@ -1132,6 +1132,8 @@ _yacc= usr.bin/yacc .if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree +.else +_nmtree_itools= nmtree .endif .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 |