diff options
| author | obrien <obrien@FreeBSD.org> | 2000-10-03 20:09:51 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-10-03 20:09:51 +0000 |
| commit | 619341766f13431cf1ad1bbed486967b84a17d64 (patch) | |
| tree | 74e6874debfb6e93deacb90b85043ff5aa91657f /sys | |
| parent | 5e185d1bd494fb96a10b69ea9d18ba6aaaeb872e (diff) | |
| download | FreeBSD-src-619341766f13431cf1ad1bbed486967b84a17d64.zip FreeBSD-src-619341766f13431cf1ad1bbed486967b84a17d64.tar.gz | |
Blah rev 1.208 got bits of the proposed "I want the file /kernel to be
the kernel" patch.
This commit is only the "Do not prepend `DESTDIR' to `KMODDIR' as
sys/conf/kmod.mk already does that for us" change.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/Makefile.i386 | 13 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 8bd3cb6..e58a5fd 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -23,7 +23,6 @@ KERNEL_KO?= kernel KERNEL?= kernel KODIR?= /boot/${KERNEL} -KCOREDIR?= ${KODIR} STD8X16FONT?= iso .if !defined(S) @@ -239,18 +238,18 @@ kernel-install kernel-install.debug: mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif mkdir -p ${DESTDIR}${KODIR} - @if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR} + ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR} .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) all: modules diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 8bd3cb6..e58a5fd 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -23,7 +23,6 @@ KERNEL_KO?= kernel KERNEL?= kernel KODIR?= /boot/${KERNEL} -KCOREDIR?= ${KODIR} STD8X16FONT?= iso .if !defined(S) @@ -239,18 +238,18 @@ kernel-install kernel-install.debug: mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif mkdir -p ${DESTDIR}${KODIR} - @if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR} + ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR} .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) all: modules |
