Set the default DESTDIR to /var/vkernel when the platform is vkernel.
authorYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Tue, 10 Feb 2009 12:40:11 +0000 (21:40 +0900)
committerYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Tue, 10 Feb 2009 12:40:11 +0000 (21:40 +0900)
This saves some keystrokes as long as you use the standard installation
location for vkernel(as shown in vkernel(7)).

sys/conf/kern.paths.mk
sys/conf/kern.post.mk

index 93c3fd0..72fb70e 100644 (file)
@@ -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
index de0dc8e..e95b3ce 100644 (file)
@@ -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"; \