diff options
| author | msmith <msmith@FreeBSD.org> | 1999-02-17 20:56:09 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1999-02-17 20:56:09 +0000 |
| commit | 64dde860b462638b1c97865f9bb75e63d490a33d (patch) | |
| tree | 957fcfd4813bc41a155bd2c006b5061be6f1a54f | |
| parent | 1f1828bc6d021f04c3bf10d973ca2d887965578e (diff) | |
| download | FreeBSD-src-64dde860b462638b1c97865f9bb75e63d490a33d.zip FreeBSD-src-64dde860b462638b1c97865f9bb75e63d490a33d.tar.gz | |
Use ${MAKE} not 'make -f'
Submitted by: tfreak@fluffybunny.jaded.net
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.upgrade | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.222 1998/12/28 17:03:49 peter Exp $ +# $Id: Makefile,v 1.223 1999/01/26 09:12:20 jkh Exp $ # # The user-driven targets are: # @@ -96,7 +96,7 @@ TGTS = afterdistribute all buildworld checkdpadd clean cleandepend cleandir \ # ${TGTS} : upgrade_checks @cd ${.CURDIR}; \ - make -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET} + ${MAKE} -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET} # Set a reasonable default .MAIN: all @@ -110,7 +110,7 @@ ${TGTS} : upgrade_checks # the system to current. # upgrade_checks : - @cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else make -f Makefile.upgrade make; fi; + @cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else ${MAKE} -f Makefile.upgrade make; fi; # # A simple test target used as part of the test to see if make supports @@ -133,4 +133,4 @@ upgrade: aout-to-elf ${UPGRADE} : upgrade_checks @cd ${.CURDIR}; \ - make -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET} + ${MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET} diff --git a/Makefile.upgrade b/Makefile.upgrade index fa9b32a..16a9f50 100644 --- a/Makefile.upgrade +++ b/Makefile.upgrade @@ -1,5 +1,5 @@ # -# $Id: Makefile.upgrade,v 1.13 1999/01/27 15:08:05 jkh Exp $ +# $Id: Makefile.upgrade,v 1.14 1999/02/13 18:49:02 jkh Exp $ # # This makefile contains rules for preforming upgrades that are outside # the scope of the normal build world process. @@ -81,7 +81,7 @@ ${MAKEOBJDIRPREFIX}/do_aout_buildworld : @echo "--------------------------------------------------------------" @cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \ OBJFORMAT=aout REALLY_WANT_DEPRECIATED_AOUT=yes \ - make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld + ${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld @touch ${MAKEOBJDIRPREFIX}/do_aout_buildworld # @@ -101,7 +101,7 @@ ${MAKEOBJDIRPREFIX}/do_elf_buildworld : @cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \ PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \ TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \ - make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld + ${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld @touch ${MAKEOBJDIRPREFIX}/do_elf_buildworld # @@ -216,7 +216,7 @@ ${MAKEOBJDIRPREFIX}/do_elf_installworld : @cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \ PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \ TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \ - make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld + ${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld @if [ ! -f /etc/pam.conf ]; then cp ${.CURDIR}/etc/pam.conf /etc; fi @if [ ! -f /etc/auth.conf ]; then cp ${.CURDIR}/etc/auth.conf /etc; fi @if [ ! -f /etc/login.conf ]; then cp ${.CURDIR}/etc/login.conf /etc; fi |
