diff options
27 files changed, 75 insertions, 75 deletions
diff --git a/distrib/Makefile b/distrib/Makefile index b07cdd2e907..3d259e01381 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2007/08/01 21:31:06 deraadt Exp $ +# $OpenBSD: Makefile,v 1.33 2008/01/11 10:16:40 espie Exp $ SUBDIR= special notes @@ -17,7 +17,7 @@ SUBDIR+=crunch #all: crunch-tools _SUBDIRUSE crunch-tools: - (cd $(.CURDIR)/crunch; $(MAKE) obj; \ - $(MAKE) depend && ${MAKE} && ${SUDO} ${MAKE} DESTDIR= install) + cd $(.CURDIR)/crunch; $(MAKE) obj; \ + $(MAKE) depend && ${MAKE} && ${SUDO} ${MAKE} DESTDIR= install .include <bsd.subdir.mk> diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 24ce4f940ad..42eeabad372 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2007/06/17 00:28:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -51,7 +51,7 @@ bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT} bsd: cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \ - make depend && make clean && COPTS=-Os make + ${MAKE} depend && ${MAKE} clean && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index 4e537d9e12a..74357906d37 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.18 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.19 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -75,7 +75,7 @@ bsd.rd: bsd ${IMAGE} ${RDSETROOT} bsd: cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \ - make depend && make clean && COPTS=-Os make + ${MAKE} depend && ${MAKE} clean && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc index be0a3c5f7fc..d15ed56eed5 100644 --- a/distrib/alpha/inst-common/Makefile.inc +++ b/distrib/alpha/inst-common/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.7 2004/11/05 21:22:37 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2008/01/11 10:16:40 espie Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -22,7 +22,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all ${STRIP} -R .eh_frame ${CBIN} do_files: diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index 907d03c33e0..a85c9c37f09 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2007/08/09 12:48:07 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -66,7 +66,7 @@ bsd.rd: ${IMAGE} bsd rdsetroot bsd: cd ${.CURDIR}/../../../sys/arch/amd64/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \ - make clean && make depend && COPTS=-Os make + ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/bsd bsd ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown @@ -108,7 +108,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all strip -R .comment ${CBIN} ${CRUNCHCONF}: ${LISTS} diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index 7f0dcd03b9f..a68843c1ce9 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2007/04/13 17:34:40 millert Exp $ +# $OpenBSD: Makefile,v 1.24 2008/01/11 10:16:40 espie Exp $ # $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ TOP= ${.CURDIR}/.. @@ -35,7 +35,7 @@ bsd.rd: rdsetroot .ifndef(NOBUILD) cd ${.CURDIR}/../../../sys/arch/hp300/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/hp300/compile/RAMDISK && \ - make clean && make depend && COPTS=-Os make + ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} .endif cp ${.CURDIR}/../../../sys/arch/hp300/compile/RAMDISK/bsd bsd.rd ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE} diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc index 52db259745b..3b963eba68d 100644 --- a/distrib/hp300/ramdisk/Makefile.inc +++ b/distrib/hp300/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.6 2002/05/27 02:58:40 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2008/01/11 10:16:40 espie Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -22,7 +22,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 3a91cbeb784..7383129d669 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2008/01/11 10:16:40 espie Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -65,7 +65,7 @@ ${CDROM}: bsd ${CDBOOT} obsd: cd ${SRCDIR}/sys/arch/${MACHINE}/conf && config ${KERNEL} cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL} && \ - make depend && make clean && make + ${MAKE} depend && ${MAKE} clean && ${MAKE} cp ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/bsd obsd bsd.rd: obsd ${IMAGE} ${RDSETROOT} @@ -105,7 +105,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index cdd55e818d1..d4dc437f993 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.20 2007/08/09 12:48:07 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.21 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -66,7 +66,7 @@ bsd.rd: ${IMAGE} bsd rdsetroot bsd: cd ${.CURDIR}/../../../sys/arch/i386/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK} && \ - make clean && make depend && COPTS=-Os make + ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/bsd bsd ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown @@ -108,7 +108,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all strip -R .comment ${CBIN} ${CRUNCHCONF}: ${LISTS} diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index a414b53ad5d..c9630fd21b9 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -36,7 +36,7 @@ bsd: .ifndef(NOBUILD) cd ${.CURDIR}/../../../sys/arch/luna88k/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/luna88k/compile/RAMDISK && \ - make clean && make + ${MAKE} clean && ${MAKE} .endif cp ${.CURDIR}/../../../sys/arch/luna88k/compile/RAMDISK/bsd bsd @@ -74,7 +74,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 4c27305f502..04d3894848a 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.2 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2008/01/11 10:16:40 espie Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -21,13 +21,13 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all #${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} # crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# make -f ${CBIN}.mk all +# ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile index a5acea51c8e..5416f8ac773 100644 --- a/distrib/mac68k/ramdisk/Makefile +++ b/distrib/mac68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/04/13 17:34:40 millert Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -35,7 +35,7 @@ bsd: .ifndef(NOBUILD) cd ${.CURDIR}/../../../sys/arch/mac68k/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK && \ - make clean && make depend && make + ${MAKE} clean && ${MAKE} depend && ${MAKE} .endif cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK/bsd bsd @@ -73,7 +73,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc index 939720a09a8..e24ed759fab 100644 --- a/distrib/mac68k/ramdisk/Makefile.inc +++ b/distrib/mac68k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.5 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2008/01/11 10:16:40 espie Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -22,13 +22,13 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all #${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} # crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# make -f ${CBIN}.mk all +# ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 02e88781af3..9db8e2d5faf 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2008/01/11 10:16:40 espie Exp $ REV= ${OSrev} @@ -70,7 +70,7 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: cd ${TOP}/../../sys/arch/macppc/conf && config RAMDISK cd ${TOP}/../../sys/arch/macppc/compile/RAMDISK && \ - make clean && make depend && make + ${MAKE} clean && ${MAKE} depend && ${MAKE} cp ${TOP}/../../sys/arch/macppc/compile/RAMDISK/bsd bsd rd_setup: @@ -102,7 +102,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all ${CRUNCHCONF}: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 7bc1d7a542f..b58c9a0008b 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.29 2008/01/11 10:16:40 espie Exp $ REV= ${OSrev} @@ -41,7 +41,7 @@ all: bsd: cd ${.CURDIR}/../../sys/arch/${MACHINE}/conf && config GENERIC cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/GENERIC && \ - make clean && make + ${MAKE} clean && ${MAKE} cp ${.CURDIR}/../../sys/arch/${MACHINE}/compile/GENERIC/bsd bsd all: ${CBIN} bsd @@ -70,7 +70,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index ad7bd71e010..34be83ac6c2 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -36,7 +36,7 @@ bsd: .ifndef(NOBUILD) cd ${.CURDIR}/../../../sys/arch/mvme68k/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/mvme68k/compile/RAMDISK && \ - make clean && make + ${MAKE} clean && ${MAKE} .endif cp ${.CURDIR}/../../../sys/arch/mvme68k/compile/RAMDISK/bsd bsd @@ -74,7 +74,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc index 0722eca1d42..85c3d818662 100644 --- a/distrib/mvme68k/ramdisk/Makefile.inc +++ b/distrib/mvme68k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.8 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2008/01/11 10:16:40 espie Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -22,13 +22,13 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all #${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} # crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# make -f ${CBIN}.mk all +# ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile index df17f96edbe..c319217f900 100644 --- a/distrib/mvme88k/ramdisk/Makefile +++ b/distrib/mvme88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -36,7 +36,7 @@ bsd: .ifndef(NOBUILD) cd ${.CURDIR}/../../../sys/arch/mvme88k/conf && config RAMDISK cd ${.CURDIR}/../../../sys/arch/mvme88k/compile/RAMDISK && \ - make clean && make + ${MAKE} clean && ${MAKE} .endif cp ${.CURDIR}/../../../sys/arch/mvme88k/compile/RAMDISK/bsd bsd @@ -74,7 +74,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc index a61bd38d962..19a50719896 100644 --- a/distrib/mvme88k/ramdisk/Makefile.inc +++ b/distrib/mvme88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.8 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2008/01/11 10:16:40 espie Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -21,13 +21,13 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all #${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} # crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# make -f ${CBIN}.mk all +# ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile index ad2f2a64e71..5d7ce41a9de 100644 --- a/distrib/mvmeppc/ramdisk/Makefile +++ b/distrib/mvmeppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -53,7 +53,7 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: cd ${TOP}/../../sys/arch/mvmeppc/conf && config RAMDISK cd ${TOP}/../../sys/arch/mvmeppc/compile/RAMDISK && \ - make clean && make + ${MAKE} clean && ${MAKE} cp ${TOP}/../../sys/arch/mvmeppc/compile/RAMDISK/bsd bsd rd_setup: @@ -85,7 +85,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 256eba72e93..9a08c877ccd 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.32 2008/01/11 10:16:40 espie Exp $ REV= ${OSrev} @@ -85,7 +85,7 @@ ${FLOPPY}: bsd.gz ${BOOT} ${BOOTXX} bsd: cd ${.CURDIR}/../../sys/arch/${MACHINE}/conf && config ${KERNEL} cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL} && \ - make depend && make clean && COPTS=-Os make + ${MAKE} depend && ${MAKE} clean && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/bsd bsd bsd.rd: bsd ${IMAGE} ${RDSETROOT} @@ -125,7 +125,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index d15768b1222..0275617337a 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/11 10:16:40 espie Exp $ REV= ${OSrev} @@ -46,7 +46,7 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK && \ - make clean && make + ${MAKE} clean && ${MAKE} cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK/bsd bsd rd_setup: @@ -78,7 +78,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all ${CRUNCHCONF}: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index e5fa5374793..7cd0530c683 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -55,7 +55,7 @@ bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT} bsd: cd ${.CURDIR}/../../../sys/arch/sparc64/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \ - make depend && make clean && COPTS=-Os make + ${MAKE} depend && ${MAKE} clean && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/bsd bsd ${IMAGE}: do_prep do_mount do_files do_umount @@ -122,7 +122,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index 335663bffc2..977ecf27549 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -88,7 +88,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 4fbe82592db..874931b0b84 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.19 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -85,7 +85,7 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: cd ${TOP}/../../sys/arch/sparc64/conf && config ${KERNEL} cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \ - make clean && make depend && COPTS=-Os make + ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd rd_setup: @@ -120,7 +120,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index a98659a677c..4023f2bf7fe 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2007/06/17 00:28:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2008/01/11 10:16:40 espie Exp $ TOP= ${.CURDIR}/.. @@ -85,7 +85,7 @@ ${IMAGE}: rd_setup do_files rd_teardown bsd: cd ${TOP}/../../sys/arch/sparc64/conf && config ${KERNEL} cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \ - make clean && make depend && COPTS=-Os make + ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd rd_setup: @@ -120,7 +120,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/vax/common/Makefile.inc b/distrib/vax/common/Makefile.inc index 82b8a69a5ed..d1df15e24de 100644 --- a/distrib/vax/common/Makefile.inc +++ b/distrib/vax/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2007/04/13 17:34:40 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2008/01/11 10:16:40 espie Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -47,7 +47,7 @@ bootroot: xxboot boot vnconfig -u ${VND} xxboot boot: - (cd /usr/src/sys/arch/vax/boot;make) + cd /usr/src/sys/arch/vax/boot;${MAKE} cp /usr/src/sys/arch/vax/boot/xxboot/xxboot . cp /usr/src/sys/arch/vax/boot/boot/boot . @@ -64,7 +64,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -D ${TOP}/../../ -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk + ${MAKE} -f ${CBIN}.mk clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c |