diff options
author | brooks <brooks@FreeBSD.org> | 2012-10-18 12:32:51 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2012-10-18 12:32:51 +0000 |
commit | 1220baed634a69689b65c23f12faacc46ef6d9d3 (patch) | |
tree | c516905d0d0b2ad382d73f3a5bc79ed171eefafe /Makefile.inc1 | |
parent | 6aa3a748568b4b9975a4eceb7df2a3bf1b8fd08f (diff) | |
download | FreeBSD-src-1220baed634a69689b65c23f12faacc46ef6d9d3.zip FreeBSD-src-1220baed634a69689b65c23f12faacc46ef6d9d3.tar.gz |
Allow LOCAL_(DIRS,LIBS) to install files in directories not found in the
system mtree files via a LOCAL_MTREE variable which contains a list of
mtree files to be applyed along with the base mtree files to the tmp root
and DESTDIR.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 14f13ee..ef8b192 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -16,6 +16,8 @@ # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target +# LOCAL_MTREE="list of mtree files" to process to allow local directories +# to be created before files are installed # LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools # list # TARGET="machine" to crossbuild world for a different machine type @@ -407,6 +409,9 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null .endif +.for _mtree in ${LOCAL_MTREE} + mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null +.endfor _legacy: @echo @echo "--------------------------------------------------------------" @@ -724,7 +729,8 @@ reinstall: @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ + LOCAL_MTREE=${LOCAL_MTREE} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" @@ -1221,6 +1227,10 @@ cross-tools: # hierarchy hier: cd ${.CURDIR}/etc; ${MAKE} distrib-dirs +.for _mtree in ${LOCAL_MTREE} + mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/${_mtree} \ + -p ${DESTDIR}/ +.endfor # # libraries - build all libraries, and install them under ${DESTDIR}. |