Browse Source

conditionally create obj & xobj same way that src is handled

ok natano
OPENBSD_6_1
deraadt 8 years ago
parent
commit
3ed076289c
2 changed files with 8 additions and 8 deletions
  1. +7
    -1
      src/etc/Makefile
  2. +1
    -7
      src/etc/mtree/4.4BSD.dist

+ 7
- 1
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.436 2016/10/05 18:00:41 natano Exp $
# $OpenBSD: Makefile,v 1.437 2016/10/05 21:39:57 deraadt Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@ -232,6 +232,12 @@ distrib-dirs:
if [ ! -d ${DESTDIR}/usr/src ]; then \
${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/src; \
fi
if [ ! -d ${DESTDIR}/usr/obj ]; then \
${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/obj; \
fi
if [ ! -d ${DESTDIR}/usr/xobj ]; then \
${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/xobj; \
fi
cd ${DESTDIR}/; ln -fhs usr/src/sys sys
chown -h root:wheel ${DESTDIR}/sys


+ 1
- 7
src/etc/mtree/4.4BSD.dist View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.290 2016/09/27 20:18:34 rpe Exp $
# $OpenBSD: 4.4BSD.dist,v 1.291 2016/10/05 21:40:01 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
@ -416,8 +416,6 @@ usr
# ./usr/mdec
mdec
..
obj gname=wsrc mode=0775
..
sbin
..
@ -592,10 +590,6 @@ usr
..
..
..
# ./usr/xobj
xobj gname=wsrc mode=0775
..
..
# ./var


Loading…
Cancel
Save