summaryrefslogtreecommitdiff
path: root/distrib/miniroot/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/miniroot/Makefile')
-rw-r--r--distrib/miniroot/Makefile17
1 files changed, 11 insertions, 6 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile
index ca998066c33..233a88671c9 100644
--- a/distrib/miniroot/Makefile
+++ b/distrib/miniroot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2009/04/12 16:12:53 deraadt Exp $
+# $OpenBSD: Makefile,v 1.31 2009/04/17 03:58:54 deraadt Exp $
REV= ${OSrev}
@@ -11,6 +11,8 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot
.include "${ARCHDIR}/Makefile.inc"
.endif
+UTILS= ${.CURDIR}
+
MOUNT_POINT?= /mnt
VND?= svnd0
VND_DEV= /dev/${VND}a
@@ -51,8 +53,9 @@ all: ${CBIN} bsd
newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} || ${NEWFS_WILL_FAIL}
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
- REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \
- TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${LISTS}
+ REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ UTILS=${UTILS} ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} \
+ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
rm ${MOUNT_POINT}/${CBIN}
@echo ""
@df -i ${MOUNT_POINT}
@@ -76,11 +79,13 @@ clean cleandir:
/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
${CBIN}.conf *.o *.lo *.c
-beforeinstall:
- cp ${IMAGE} ${DESTDIR}/snapshot
-
.endif # DESTDIR check
+.ifdef RELEASEDIR
+beforeinstall:
+ cp ${IMAGE} ${RELEASEDIR}
+.endif
+
unconfig:
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND}