From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 11 Oct 2016 07:33:18 +0000 (+0200)
Subject: include: prereq-build.mk: improve gcp check
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b81fc29123f777f61d99c59c214a69e253cb2cc0;p=openwrt%2Fstaging%2Fjow.git

include: prereq-build.mk: improve gcp check

Adjust the check for gcp (GNU copy command) to rule out false positives
with "Goffi's CoPier" a python copy command.

Fixes FS#218.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 4a0509ac00..ed652ca9a7 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -109,8 +109,8 @@ $(eval $(call SetupHostCommand,diff,Please install diffutils, \
 	diff --version 2>&1 | grep diff))
 
 $(eval $(call SetupHostCommand,cp,Please install GNU fileutils, \
-	gcp --help, \
-	cp --help))
+	gcp --help 2>&1 | grep 'Copy SOURCE', \
+	cp --help 2>&1 | grep 'Copy SOURCE'))
 
 $(eval $(call SetupHostCommand,seq,, \
 	gseq --version, \