log.mk, profile.mk: Output errors Step 3 to BUILDLOG and on screen
This commit is contained in:
parent
dad8f98e65
commit
9fc8689db8
@ -25,9 +25,11 @@ ifeq (2,$(DEBUG))
|
||||
SHELL += -x
|
||||
endif
|
||||
LOG = >>$(BUILDLOG) 2>&1
|
||||
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
|
||||
else
|
||||
MAKE += -s
|
||||
LOG = 2>>$(BUILDLOG) >/dev/null
|
||||
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>/dev/null
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out $(DIRECT_TARGETS),$(MAKECMDGOALS)))
|
||||
|
@ -132,7 +132,8 @@ profile/dump-vars:
|
||||
fi $(LOG)
|
||||
|
||||
# step 3 entry point: copy the needed parts into BUILDDIR
|
||||
profile/populate: SHELL=/bin/bash
|
||||
profile/populate: profile/finalize profile/dump-vars make-aptbox
|
||||
@for dir in sub.in features.in pkg.in; do \
|
||||
$(MAKE) -C $$dir $(LOG); \
|
||||
$(MAKE) -C $$dir $(LOG_STDERR); \
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user