aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando J. Pereda <ferdy@gentoo.org>2007-04-04 22:42:33 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-05 15:13:44 -0700
commit3b486cd229f1db437462a45103ef01d50c47a00d (patch)
tree625865d014a622b2bfd8d26a4b44c4c0fa85020a
parent33580fbd308593e36395926fd35b501976ad322a (diff)
downloadgit-3b486cd229f1db437462a45103ef01d50c47a00d.tar.gz
git-3b486cd229f1db437462a45103ef01d50c47a00d.tar.xz
Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 507ad9103..c9a84aa25 100644
--- a/Makefile
+++ b/Makefile
@@ -641,7 +641,7 @@ ifeq ($(TCLTK_PATH),)
NO_TCLTK=NoThanks
endif
-QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 =
ifneq ($(findstring $(MAKEFLAGS),w),w)
@@ -657,7 +657,7 @@ ifndef V
QUIET_LINK = @echo ' ' LINK $@;
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
QUIET_GEN = @echo ' ' GEN $@;
- QUIET_SUBDIR0 = @subdir=
+ QUIET_SUBDIR0 = +@subdir=
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
$(MAKE) $(PRINT_DIR) -C $$subdir
export V