diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2003-12-24 10:59:33 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2003-12-24 10:59:33 +0000 |
| commit | 4e923ac5838c7c201d42b0359c8c3f68047f2d70 (patch) | |
| tree | 15118d9b7669c77d4f4ac7053b7628fea7e82c52 /rescue | |
| parent | ad4688e13123b9abca6e62401008612d177b6ec2 (diff) | |
| download | src-4e923ac5838c7c201d42b0359c8c3f68047f2d70.tar.gz src-4e923ac5838c7c201d42b0359c8c3f68047f2d70.zip | |
Properly spell make binary as ${MAKE}.
This fixes buildworld for systems with old make(1) binaries.
Reported by: Benjamin Close
Notes
Notes:
svn path=/head/; revision=123802
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 7b9dba6fc16f..48dd6dad523e 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -266,17 +266,17 @@ $(OUTPUTS): $(CONF) -c $(OUTC) $(CONF) $(PROG): $(OUTPUTS) objs - MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) + MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) objs: $(OUTMK) - MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs + MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) objs # <sigh> Someone should replace the bin/csh and bin/sh build-tools with # shell scripts so we can remove this nonsense. build-tools: .for _tool in bin/csh bin/sh cd $(.CURDIR)/../../${_tool}; \ - MAKEOBJDIRPREFIX=${CRUNCHOBJS} make DIRPRFX=rescue/${_tool} build-tools + MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} DIRPRFX=rescue/${_tool} build-tools .endfor # Use a separate build tree to hold files compiled for this crunchgen binary @@ -288,10 +288,10 @@ cleandepend cleandir obj objlink: .for P in $(CRUNCH_PROGS_$(D)) .ifdef CRUNCH_SRCDIR_${P} cd ${CRUNCH_SRCDIR_$(P)} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} .else cd $(.CURDIR)/../../${D}/${P} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} .endif .endfor .endfor @@ -299,16 +299,16 @@ cleandepend cleandir obj objlink: clean: rm -f ${CLEANFILES} if [ -e ${.OBJDIR}/$(OUTMK) ]; then \ - MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) clean; \ + MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) clean; \ fi .for D in $(CRUNCH_SRCDIRS) .for P in $(CRUNCH_PROGS_$(D)) .ifdef CRUNCH_SRCDIR_${P} cd ${CRUNCH_SRCDIR_$(P)} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} .else cd $(.CURDIR)/../../${D}/${P} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} .endif .endfor .endfor |