d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ${MAKE} not 'make -f'

Browse Source 
Submitted by:	tfreak@fluffybunny.jaded.net
This commit is contained in:
Mike Smith 1999-02-17 20:56:09 +00:00
parent 133ff2619a
commit 8bc83b236e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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}

8
Makefile.upgrade
View File

@ -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