summaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2013-01-29 22:17:58 +0000
committerBrooks Davis <brooks@FreeBSD.org>2013-01-29 22:17:58 +0000
commit64dc091fddac12f4ea20d093534c56b0e29cd849 (patch)
tree2bf04924ba8f1646aa92b928679934680e0bde69 /Makefile.inc1
parentbeb7ecad2b4209201e99def95020d704c9ffa074 (diff)
downloadsrc-test-64dc091fddac12f4ea20d093534c56b0e29cd849.tar.gz
src-test-64dc091fddac12f4ea20d093534c56b0e29cd849.zip
Log the addition of login.conf.db, passwd, pwd.db, and spwd.db via cat -l.
Make cat a bootstrap tool to facilitate this.
Notes
Notes: svn path=/head/; revision=246097
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc19
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index cbf10ea2a9c89..d5f6f2e281f7a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -185,7 +185,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -412,7 +412,7 @@ _worldtmp:
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
- lib usr legacy/usr
+ lib usr legacy/bin legacy/usr
mkdir -p ${WORLDTMP}/${_dir}
.endfor
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
@@ -1136,6 +1136,10 @@ _nmtree= lib/libnetbsd \
_nmtree_itools= nmtree
.endif
+.if ${BOOTSTRAPPING} < 1000027
+_cat= bin/cat
+.endif
+
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
_awk= usr.bin/awk
.endif
@@ -1191,6 +1195,7 @@ bootstrap-tools:
${_ar} \
${_dtc} \
${_awk} \
+ ${_cat} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \