From 4d05ccca2cf5df8842143478e7100b013cf1df3e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 14 Jan 2018 13:25:40 +0100
Subject: [PATCH] Simplify finding Qt5 tools Closes #551

---
 source/Makefile.mk | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/source/Makefile.mk b/source/Makefile.mk
index f7ef10c51..77413396c 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -262,28 +262,9 @@ endif
 endif
 
 ifeq ($(HAVE_QT5),true)
-QT5_LIBDIR = $(shell pkg-config --variable=libdir Qt5Core)
-ifeq ($(BSD),true)
-MOC_QT5 ?= $(QT5_LIBDIR)/bin/moc
-RCC_QT5 ?= $(QT5_LIBDIR)/bin/rcc
-endif
-ifeq ($(HAIKU),true)
-MOC_QT5 ?= $(QT5_LIBDIR)/../../bin/moc
-RCC_QT5 ?= $(QT5_LIBDIR)/../../bin/rcc
-endif
-ifeq ($(MACOS),true)
-MOC_QT5 ?= $(QT5_LIBDIR)/../bin/moc
-RCC_QT5 ?= $(QT5_LIBDIR)/../bin/rcc
-endif
-ifeq ($(MOC_QT5),)
-ifneq (,$(wildcard $(QT5_LIBDIR)/qt5/bin/moc))
-MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc
-RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc
-else
-MOC_QT5 ?= $(QT5_LIBDIR)/qt/bin/moc
-RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc
-endif
-endif
+QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
+MOC_QT5 ?= $(QT5_HOSTBINS)/moc
+RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
 ifeq (,$(wildcard $(MOC_QT5)))
 HAVE_QT5=false
 endif