diff options
| author | ru <ru@FreeBSD.org> | 2004-12-23 10:13:17 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-12-23 10:13:17 +0000 |
| commit | e73a95c8c7b8cb7eb66a5a2b8b7b1d0c4dd26b07 (patch) | |
| tree | adc050af75852254d3660f7e169a8652b1c57d57 /rescue | |
| parent | 00b956726aea745fe444447b04c83491e32218c3 (diff) | |
| download | FreeBSD-src-e73a95c8c7b8cb7eb66a5a2b8b7b1d0c4dd26b07.zip FreeBSD-src-e73a95c8c7b8cb7eb66a5a2b8b7b1d0c4dd26b07.tar.gz | |
Make "===> " prefixes look sane.
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index ba942a7..fe685ac 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -256,7 +256,10 @@ $(CONF): Makefile echo special $(P) srcdir $(.CURDIR)/../../$(D)/$(P) >>$(.TARGET) .endif .ifdef CRUNCH_BUILDOPTS_${P} - echo special $(P) buildopts $(CRUNCH_BUILDOPTS_${P}) >>$(.TARGET) + echo special $(P) buildopts DIRPRFX=${DIRPRFX}${P}/ \ + $(CRUNCH_BUILDOPTS_${P}) >>$(.TARGET) +.else + echo special $(P) buildopts DIRPRFX=${DIRPRFX}${P}/ >>$(.TARGET) .endif .for A in $(CRUNCH_ALIAS_$(P)) echo ln $(P) $(A) >>$(.TARGET) @@ -281,7 +284,7 @@ objs: $(OUTMK) build-tools: .for _tool in bin/csh bin/sh cd $(.CURDIR)/../../${_tool}; \ - MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} DIRPRFX=rescue/${_tool} build-tools + MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools .endfor # Use a separate build tree to hold files compiled for this crunchgen binary @@ -293,10 +296,12 @@ 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} \ + DIRPRFX=${DIRPRFX}${P}/ ${.TARGET} .else cd $(.CURDIR)/../../${D}/${P} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \ + DIRPRFX=${DIRPRFX}${P}/ ${.TARGET} .endif .endfor .endfor @@ -310,10 +315,12 @@ clean: .for P in $(CRUNCH_PROGS_$(D)) .ifdef CRUNCH_SRCDIR_${P} cd ${CRUNCH_SRCDIR_$(P)} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \ + DIRPRFX=${DIRPRFX}${P}/ ${.TARGET} .else cd $(.CURDIR)/../../${D}/${P} && \ - MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} ${.TARGET} + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \ + DIRPRFX=${DIRPRFX}${P}/ ${.TARGET} .endif .endfor .endfor |
