From: niklas <niklas@openbsd.org>
Date: Sat, 3 May 1997 16:50:56 +0000 (+0000)
Subject: Introduce IMAGEDIR to control where the image gets built.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d5e74f1bf86a624eb85ddca2a10c5d90f31c130e;p=openbsd

Introduce IMAGEDIR to control where the image gets built.
  Fix argument to vnconfig -u.
---

diff --git a/distrib/simpleroot/Makefile b/distrib/simpleroot/Makefile
index 6eb6cf96fc7..9422be04790 100644
--- a/distrib/simpleroot/Makefile
+++ b/distrib/simpleroot/Makefile
@@ -13,8 +13,9 @@ VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
 DISKTYPE=	simpleroot
 PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-IMAGE?=		/var/tmp/simpleroot${REV}.fs
+IMAGEDIR?=	/var/tmp
+REALIMAGE!=	echo ${IMAGEDIR}/image.${PID}
+IMAGE?=		${IMAGEDIR}/simpleroot${REV}.fs
 NEWFSOPTS?=
 
 LIST=		${ARCHDIR}/list
@@ -41,12 +42,12 @@ all:
 	  tar xpf - ) && \
 	( cd ${MOUNT_POINT} && \
 	tar cf - .??* * | ${GZIP} ${GZIPFLAGS} \
-	  > /var/tmp/simpleroot${REV}.tar${GZIPEXT} )
+	  > ${IMAGEDIR}/simpleroot${REV}.tar${GZIPEXT} )
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
+	vnconfig -u ${VND}
 	cat /*bin/* > /dev/null
 	cp ${REALIMAGE} ${IMAGE}
 .if (${GZIP} == "gzip")