From: YONETANI Tomokazu <y0netan1@dragonflybsd.org>
Date: Tue, 10 Feb 2009 12:40:11 +0000 (+0900)
Subject: Set the default DESTDIR to /var/vkernel when the platform is vkernel.
X-Git-Tag: v2.2.0~6^2~2^2~2
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/663216ba106a42e4ba47d55a6ab72be1c37dda7e

Set the default DESTDIR to /var/vkernel when the platform is vkernel.

This saves some keystrokes as long as you use the standard installation
location for vkernel(as shown in vkernel(7)).
---

diff --git a/sys/conf/kern.paths.mk b/sys/conf/kern.paths.mk
index 93c3fd0fa9..72fb70eac1 100644
--- a/sys/conf/kern.paths.mk
+++ b/sys/conf/kern.paths.mk
@@ -13,3 +13,9 @@ DESTKERNNAME?=		${KERNEL}
 DESTMODULESNAME?=	modules
 .endif
 DESTKERNDIR?=		/boot
+
+# Set DESTDIR to /var/vkernel by default for vkernel platform so as
+# not to shoot the real kernel installation.
+.if ${MACHINE_PLATFORM} == vkernel
+DESTDIR?=		/var/vkernel
+.endif
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index de0dc8e29b..e95b3ce230 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -142,11 +142,6 @@ kernel-reinstall: kernel-installable
 .endif
 
 kernel-installable:
-.if ${P} == vkernel
-.if !defined(DESTDIR)
-	@echo "When installing a virtual kernel, DESTDIR must be manually specified"
-	@exit 1
-.endif
 	@if [ -f ${DESTDIR}/${DESTKERNNAME} ]; then \
 		echo "You need to make buildworld, installworld, and upgrade"; \
 		echo "before you can install a new kernel, because the"; \