diff options
| author | brooks <brooks@FreeBSD.org> | 2014-01-30 22:26:51 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-01-30 22:26:51 +0000 |
| commit | 7957d0e660e69bd62f1485b7360eba22cd778ab6 (patch) | |
| tree | 704de8111547c9b283636b22777e0128433c7f1c /Makefile.inc1 | |
| parent | 0a07d9ce6d7695e0b79bda59f51c5ec42b73d1a5 (diff) | |
| download | FreeBSD-src-7957d0e660e69bd62f1485b7360eba22cd778ab6.zip FreeBSD-src-7957d0e660e69bd62f1485b7360eba22cd778ab6.tar.gz | |
Merge from CheriBSD:
commit 1b41f6de7ca09e04fdc6f66bc478ea6c981a41b9
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Mon Jan 27 22:59:02 2014 +0000
Now that mtree is always nmtree use it as mtree
Tested on: ref9-amd64
X-MFC after: never
Sponsored by: DARPA, AFRL
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 27b1d38..00d0a9f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -448,7 +448,7 @@ MTREEFLAGS+= -W .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" -IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFLAGS}" +IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" .endif # kernel stage @@ -765,13 +765,9 @@ _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 \ + ln lockf make mkdir mtree mv pwd_mkdb \ rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} # @@ -834,11 +830,11 @@ distributeworld installworld: _installcheck_world -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null .endif .if defined(NO_ROOT) - ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ + ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ sed -e 's#^\./#./${dist}/#' >> ${METALOG} - ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \ + ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \ sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} - ${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \ + ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \ sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG} .endif .endfor |
