From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 5 Mar 2016 21:07:18 +0000 (+0000)
Subject: prereq: stop relying on man pages and grep for --recursive on the git-submodule scrip... 
X-Git-Tag: reboot~280
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=4c80909fa141fe2921c62bd17b2b04153031df18;hp=e9d7ee4f4149e4469d49cd7bf1af532cb114e04f

prereq: stop relying on man pages and grep for --recursive on the git-submodule script directly (fixes #21968)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48934
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index a93dd63ab5..a53065576c 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -155,7 +155,7 @@ $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
 	svn --version | grep Subversion))
 
 $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
-	MANPAGER=cat git submodule --help 2>&1 | grep -q -- --recursive))
+	git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
 	file --version 2>&1 | grep file))