Quick fixes for the mtree bootstrap:
- don't announce `mtree' as `mtools'. - don't install to ${DESTDIR}/usr/sbin (which often doesn't exist if DESTDIR is set and may be read-only if DESTDIR is not set). - install to (${WORLDTMP}/usr/sbin so that the new mtree is actually in $PATH if DESTDIR is set. - don't use the host make or the host sys.mk. This is probably unimportant. - use a temporary obj dir like the one for `make'. This was mainly necessary because I forgot to remove the MAKEOBJDIRPREFIX unsetting which was just a bug for mtree. A non-quick fix would handle mtree more like a bootstrap tool (the only additional complications are to create ${BINDIR} and avoid excessive cleaning). Except a non-quick fix would change much more.
This commit is contained in:
parent
42d494a30b
commit
70c9f9745b
11
Makefile
11
Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# $Id: Makefile,v 1.199 1998/06/06 04:39:41 jkoshy Exp $
|
||||
# $Id: Makefile,v 1.200 1998/06/07 10:50:28 sos Exp $
|
||||
#
|
||||
# While porting to the another architecture include the bootstrap instead
|
||||
# of the normal build.
|
||||
@ -257,14 +257,15 @@ buildworld:
|
||||
)
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " Making mtools"
|
||||
@echo " Making mtree"
|
||||
@echo "--------------------------------------------------------------"
|
||||
mkdir -p ${WORLDTMP}/usr/sbin ${WORLDTMP}/mtree
|
||||
( \
|
||||
cd ${.CURDIR}/usr.sbin/mtree; \
|
||||
MAKEOBJDIRPREFIX=""; unset MAKEOBJDIRPREFIX; \
|
||||
${MAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all; \
|
||||
${MAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} install; \
|
||||
${MAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} clean \
|
||||
export MAKEOBJDIR=${WORLDTMP}/mtree; \
|
||||
${BMAKE} ${MK_FLAGS} all; \
|
||||
${BMAKE} ${MK_FLAGS} -B install clean \
|
||||
)
|
||||
.endif
|
||||
@echo
|
||||
|
Loading…
Reference in New Issue
Block a user