diff options
| author | brooks <brooks@FreeBSD.org> | 2013-01-17 18:32:30 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-01-17 18:32:30 +0000 |
| commit | a390aab8573d52d24403baa43f0d9095d5a2308e (patch) | |
| tree | f97a90816148ec8d7dbfe3bb50b488a6af71b182 /Makefile.inc1 | |
| parent | 5a11c621e6c0ce46a79c57ad713b98822895166b (diff) | |
| download | FreeBSD-src-a390aab8573d52d24403baa43f0d9095d5a2308e.zip FreeBSD-src-a390aab8573d52d24403baa43f0d9095d5a2308e.tar.gz | |
Rework the mtree portion of etc/Makefile's distrib-dirs target to run
mtree in a shell loop so there is only one mtree commandline. Move the
implementation of LOCAL_MTREE into etc/Makefile.
Sponsored by: DARPA, AFRL
Reviewed by: mtree :)
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ca30e75..3ba82ea 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -717,7 +717,7 @@ distributeworld installworld: installcheck .endfor -mkdir ${DESTDIR}/${DISTDIR}/base ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \ - DESTDIR=${DESTDIR}/${DISTDIR}/base + LOCAL_MTREE=${LOCAL_MTREE} DESTDIR=${DESTDIR}/${DISTDIR}/base .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -1248,11 +1248,7 @@ cross-tools: # hierarchy - ensure that all the needed directories are present # hierarchy hier: - cd ${.CURDIR}/etc; ${MAKE} distrib-dirs -.for _mtree in ${LOCAL_MTREE} - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/${_mtree} \ - -p ${DESTDIR}/ -.endfor + cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. |
