From 795958fd07e823b24f31d517edaab7c1e4c65bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20K=C3=BCmmerlin?= <rgcjonas@gmail.com>
Date: Sat, 13 Jan 2018 14:15:11 +0100
Subject: poppler qt5: use MXE's moc in PATH

Previously, qt5/bin was missing from PATH. Poppler then picks up
the host's tools which may not always work.
---
 src/poppler.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/poppler.mk b/src/poppler.mk
index 1331427..351abe0 100644
--- a/src/poppler.mk
+++ b/src/poppler.mk
@@ -22,7 +22,7 @@ define $(PKG)_BUILD
     #       because libtiff is not found, but because some references are
     #       undefined)
     cd '$(1)' \
-        && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
+        && PATH='$(PREFIX)/$(TARGET)/$(if $(filter qtbase,$($(PKG)_DEPS)),qt5,qt)/bin:$(PATH)' \
         ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-silent-rules \
@@ -54,7 +54,7 @@ define $(PKG)_BUILD
         PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \
         CXXFLAGS=-D_WIN32_WINNT=0x0500 \
         LIBTIFF_LIBS="`'$(TARGET)-pkg-config' libtiff-4 --libs`"
-    PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
+    PATH='$(PREFIX)/$(TARGET)/$(if $(filter qtbase,$($(PKG)_DEPS)),qt5,qt)/bin:$(PATH)' \
         $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) HTML_DIR=
     $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) HTML_DIR=
 
-- 
cgit v0.12