summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2004-08-09 11:38:41 +0000
committerharti <harti@FreeBSD.org>2004-08-09 11:38:41 +0000
commit91ae96e9ab60545b12f373666c26846c1980e13c (patch)
treece06f2df472d64774890fe49af15bc2a9460c586 /Makefile
parentb79aea0b622c5dfdea238c36d7f126a4dc0b42a6 (diff)
downloadFreeBSD-src-91ae96e9ab60545b12f373666c26846c1980e13c.zip
FreeBSD-src-91ae96e9ab60545b12f373666c26846c1980e13c.tar.gz
Make make recurse into sub-directories and sub-makes when given
two -n flags. If only one -n flag is given the old behaviour is retained (POLA). In order to make this working for installworld change the IMAKEENV in this case so that the tools are found (we have no temporary installation environment in this case). Submitted by: ru (IMAKEENV part)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a554e29..51bd582 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ cleanworld:
rm -rf ${BW_CANONICALOBJDIR}/*
.endif
# To be safe in this case, fall back to a 'make cleandir'
- @cd ${.CURDIR}; ${_MAKE} cleandir
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
.else
-rm -rf ${.OBJDIR}/*
chflags -R 0 ${.OBJDIR}
@@ -138,7 +138,7 @@ cleanworld:
#
${TGTS}:
- @cd ${.CURDIR}; \
+ ${_+_}@cd ${.CURDIR}; \
${_MAKE} ${.TARGET}
# Set a reasonable default
@@ -165,16 +165,16 @@ world: upgrade_checks
@echo "--------------------------------------------------------------"
@echo ">>> Making 'pre-world' target"
@echo "--------------------------------------------------------------"
- @cd ${.CURDIR}; ${_MAKE} pre-world
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} pre-world
.endif
- @cd ${.CURDIR}; ${_MAKE} buildworld
- @cd ${.CURDIR}; ${_MAKE} -B installworld
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} buildworld
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} -B installworld
.if target(post-world)
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Making 'post-world' target"
@echo "--------------------------------------------------------------"
- @cd ${.CURDIR}; ${_MAKE} post-world
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} post-world
.endif
@echo
@echo "--------------------------------------------------------------"
@@ -232,7 +232,7 @@ make: .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Building an up-to-date make(1)"
@echo "--------------------------------------------------------------"
- @cd ${.CURDIR}/usr.bin/make; \
+ ${_+_}@cd ${.CURDIR}/usr.bin/make; \
${MMAKE} obj && \
${MMAKE} depend && \
${MMAKE} all && \
OpenPOWER on IntegriCloud