Author: bdrewery
Date: Sat Oct 17 05:49:07 2015
New Revision: 289442
URL: https://svnweb.freebsd.org/changeset/base/289442
Log:
Do as r289391 did for share/mk and make installing to a non-existent directory
an error.
Most of these do a 'mkdir -p' or 'install -d' before installing, but add
the trailing / here for consistency with the userland install.
MFC after: 2 weeks
X-MFC-With: r289391
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/conf/dtb.mk
head/sys/conf/kern.post.mk
head/sys/conf/kmod.mk
Modified: head/sys/conf/dtb.mk
==============================================================================
--- head/sys/conf/dtb.mk Sat Oct 17 04:32:21 2015 (r289441)
+++ head/sys/conf/dtb.mk Sat Oct 17 05:49:07 2015 (r289442)
@@ -69,7 +69,7 @@ _dtbinstall:
test -d ${DESTDIR}${DTBDIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP}
${DESTDIR}${DTBDIR}
.for _dtb in ${DTB}
${INSTALL} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
- ${_INSTALLFLAGS} ${_dtb} ${DESTDIR}${DTBDIR}
+ ${_INSTALLFLAGS} ${_dtb} ${DESTDIR}${DTBDIR}/
.endfor
.endif # !target(realinstall)
.endif # !target(install)
Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk Sat Oct 17 04:32:21 2015 (r289441)
+++ head/sys/conf/kern.post.mk Sat Oct 17 05:49:07 2015 (r289442)
@@ -270,22 +270,22 @@ kernel-install:
fi
.endif
mkdir -p ${DESTDIR}${KODIR}
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}
${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}
${DESTDIR}${KODIR}/
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
mkdir -p ${DESTDIR}${KERN_DEBUGDIR}${KODIR}
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug
${DESTDIR}${KERN_DEBUGDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug
${DESTDIR}${KERN_DEBUGDIR}${KODIR}/
.endif
.if defined(KERNEL_EXTRA_INSTALL)
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP}
${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP}
${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/
.endif
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}
${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}
${DESTDIR}${KODIR}/
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug
${DESTDIR}${KERN_DEBUGDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug
${DESTDIR}${KERN_DEBUGDIR}${KODIR}/
.endif
config.o env.o hints.o vers.o vnode_if.o:
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Sat Oct 17 04:32:21 2015 (r289441)
+++ head/sys/conf/kmod.mk Sat Oct 17 05:49:07 2015 (r289442)
@@ -296,10 +296,10 @@ realinstall: _kmodinstall
.ORDER: beforeinstall _kmodinstall
_kmodinstall:
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/
.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS}
!= "no"
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${_INSTALLFLAGS} ${PROG}.debug ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}
+ ${_INSTALLFLAGS} ${PROG}.debug ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/
.endif
.include <bsd.links.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
