From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 6 Feb 2015 17:38:54 +0000 (+0000)
Subject: include: fix prereq tests for perl and file (#18911)
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=006d662b38c42749ec0feb4b8bd407b0fd453a74;ds=sidebyside

include: fix prereq tests for perl and file (#18911)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44296 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7945f05325..926a06f8ba 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -132,7 +132,7 @@ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
 	wget --version | grep GNU))
 
 $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
-	perl --version | grep "perl 5"))
+	perl --version | grep "perl.*v5"))
 
 $(eval $(call SetupHostCommand,python,Please install Python 2.x, \
 	python2.7 -V 2>&1 | grep Python, \
@@ -146,7 +146,7 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
 	git clone 2>&1 | grep -- --recursive))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
-	file --version | grep file))
+	file --version 2>&1 | grep file))
 
 $(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \
 	openssl version | grep OpenSSL))