Do not prepend DESTDIR' to KMODDIR' as sys/conf/kmod.mk already does

that for us.
This commit is contained in:
David E. O'Brien 2000-10-03 20:05:36 +00:00
parent 47c407bf6d
commit e48c56aeb6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=66600
5 changed files with 19 additions and 17 deletions

View File

@ -306,7 +306,7 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules

View File

@ -23,6 +23,7 @@
KERNEL_KO?= kernel
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
KCOREDIR?= ${KODIR}
STD8X16FONT?= iso
.if !defined(S)
@ -238,18 +239,18 @@ kernel-install kernel-install.debug:
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -262,7 +263,7 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules

View File

@ -271,7 +271,7 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules

View File

@ -265,7 +265,7 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules

View File

@ -23,6 +23,7 @@
KERNEL_KO?= kernel
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
KCOREDIR?= ${KODIR}
STD8X16FONT?= iso
.if !defined(S)
@ -238,18 +239,18 @@ kernel-install kernel-install.debug:
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
.endif
mkdir -p ${DESTDIR}${KODIR}
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -262,7 +263,7 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules