diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2008-01-11 10:16:41 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2008-01-11 10:16:41 +0000 |
| commit | 1d45b00dbad6f071a859df121c3940a8e740390d (patch) | |
| tree | 09f8a46437c751939e0e7697221a9af8e97a8a31 /distrib/sparc64 | |
| parent | 95dac7edd60246f4cbfef70790e08f46c8031c60 (diff) | |
cleanup: make -> ${MAKE} consistenly.
zap extra subshells.
okay miod@
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/bsd.rd/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 6 |
4 files changed, 11 insertions, 11 deletions
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 |