From 11993b59ca3ed29b1581e273546d44fc134fbe37 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 5 Sep 2018 17:12:44 -0700 Subject: build-system: don't show spurious errors looking for qmake And improve the message if we do indeed not find it. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 8e2381e6e..0cf95b543 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -141,9 +141,9 @@ echo Building in $SRC, installing in $INSTALL_ROOT if [ ! -z $CMAKE_PREFIX_PATH ] ; then QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake else - hash qmake > /dev/null && QMAKE=qmake - [ -z $QMAKE ] && hash qmake-qt5 > /dev/null && QMAKE=qmake-qt5 - [ -z $QMAKE ] && echo "cannot find qmake" && exit 1 + hash qmake > /dev/null 2> /dev/null && QMAKE=qmake + [ -z $QMAKE ] && hash qmake-qt5 > /dev/null 2> /dev/null && QMAKE=qmake-qt5 + [ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1 fi # on Debian and Ubuntu based systems, the private QtLocation and -- cgit v1.2.3-70-g09d2