diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 6292ba04225b..81c41ec7f6df 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ +# $Id: Makefile.i386,v 1.106 1997/12/18 21:03:04 bde Exp $ # # Makefile for FreeBSD # @@ -183,6 +183,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} rm -f .depend mv -f .newdep .depend +cleandepend: + rm -f .depend + links: egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \ sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink @@ -199,16 +202,18 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi - chflags noschg /kernel - mv /kernel /kernel.old +.if exists(${DESTDIR}/kernel) + chflags noschg ${DESTDIR}/kernel + mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old +.endif PATH=$${PATH}:/sbin:/usr/sbin; \ - if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ - sysctl -w kern.bootfile=/kernel.old ; \ + if [ `sysctl -n kern.bootfile` = ${DESTDIR}/kernel ] ; then \ + sysctl -w kern.bootfile=${DESTDIR}/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ fi - install -c -m 555 -o root -g wheel -fschg kernel / + install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/ ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \ ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 6292ba04225b..81c41ec7f6df 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ +# $Id: Makefile.i386,v 1.106 1997/12/18 21:03:04 bde Exp $ # # Makefile for FreeBSD # @@ -183,6 +183,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} rm -f .depend mv -f .newdep .depend +cleandepend: + rm -f .depend + links: egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \ sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink @@ -199,16 +202,18 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi - chflags noschg /kernel - mv /kernel /kernel.old +.if exists(${DESTDIR}/kernel) + chflags noschg ${DESTDIR}/kernel + mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old +.endif PATH=$${PATH}:/sbin:/usr/sbin; \ - if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ - sysctl -w kern.bootfile=/kernel.old ; \ + if [ `sysctl -n kern.bootfile` = ${DESTDIR}/kernel ] ; then \ + sysctl -w kern.bootfile=${DESTDIR}/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ fi - install -c -m 555 -o root -g wheel -fschg kernel / + install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/ ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \ ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 6292ba04225b..81c41ec7f6df 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ +# $Id: Makefile.i386,v 1.106 1997/12/18 21:03:04 bde Exp $ # # Makefile for FreeBSD # @@ -183,6 +183,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} rm -f .depend mv -f .newdep .depend +cleandepend: + rm -f .depend + links: egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \ sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink @@ -199,16 +202,18 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi - chflags noschg /kernel - mv /kernel /kernel.old +.if exists(${DESTDIR}/kernel) + chflags noschg ${DESTDIR}/kernel + mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old +.endif PATH=$${PATH}:/sbin:/usr/sbin; \ - if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ - sysctl -w kern.bootfile=/kernel.old ; \ + if [ `sysctl -n kern.bootfile` = ${DESTDIR}/kernel ] ; then \ + sysctl -w kern.bootfile=${DESTDIR}/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ fi - install -c -m 555 -o root -g wheel -fschg kernel / + install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/ ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \ ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h