From 64dde860b462638b1c97865f9bb75e63d490a33d Mon Sep 17 00:00:00 2001 From: msmith Date: Wed, 17 Feb 1999 20:56:09 +0000 Subject: Use ${MAKE} not 'make -f' Submitted by: tfreak@fluffybunny.jaded.net --- Makefile.upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile.upgrade') 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 -- cgit v1.1