diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1994-09-23 06:21:13 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1994-09-23 06:21:13 +0000 |
| commit | 2997c484c4e7ee59b92207ad43d5b620e13095a2 (patch) | |
| tree | b1f42c4fe9258e6373cc5b1204fea6722aaace57 | |
| parent | 3f56b9fa2eef71b35e17d0d3a3f1dfd607977f8a (diff) | |
| download | FreeBSD-src-2997c484c4e7ee59b92207ad43d5b620e13095a2.zip FreeBSD-src-2997c484c4e7ee59b92207ad43d5b620e13095a2.tar.gz | |
Add -e option to mtree commands so that extra directories are ignored.
Change conditional around building usr/local to be MAKE_LOCAL instead of
CDROMDIST. This was coped from src/Makefile and makes much more since.
| -rw-r--r-- | etc/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index 33ab654..9043e17 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $Id: Makefile,v 1.82 1994/09/15 04:44:03 rgrimes Exp $ +# $Id: Makefile,v 1.84 1994/09/23 06:15:19 rgrimes Exp $ # disktab may be wrong -- hcx9 is a tahoe, but gets its own. # -rw-r--r-- @@ -550,11 +550,14 @@ distrib-dirs: # XXX The mtree commands need to be redone so that a status of 0 or # 2 is okay, but a status of 1 causes the make to abort. # - mtree -d -u -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ - mtree -d -u -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var - mtree -d -u -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr -.if defined(CDROMDIST) - mtree -d -u -f ${.CURDIR}/mtree/BSD.local.dist -p ${DESTDIR}/usr/local + # XXX This will currently error out if you have a procfs mounted, + # unmount it to get past this problem until procfs is fixed. + # + mtree -deu -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ + mtree -deu -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var + mtree -deu -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr +.if defined(MAKE_LOCAL) + mtree -deu -f ${.CURDIR}/mtree/BSD.local.dist -p ${DESTDIR}/usr/local .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys |
