# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1507126985 14400
# Node ID 86176b88d1f891f9ab68fced8454c2ce6d4e0408
# Parent  0d0e6c8015af09f292103ff2600623988a98cc64
qtbase: Fix config include and prefix options for windows.

diff -r 0d0e6c8015af -r 86176b88d1f8 src/qtbase.mk
--- a/src/qtbase.mk	Tue Oct 03 11:27:47 2017 -0400
+++ b/src/qtbase.mk	Wed Oct 04 10:23:05 2017 -0400
@@ -21,10 +21,17 @@
 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
 $(PKG)_CONFIGURE_DATABASE_OPTION :=
 $(PKG)_CONFIGURE_ENV :=
-$(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)/freetype2'
+$(PKG)_CONFIGURE_INCLUDE_OPTION :=
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
 
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
+else
+  $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
+  $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
+endif
+
 ## These are needed whether cross compiling or not.
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
@@ -70,7 +77,7 @@
             -no-use-gold-linker \
             -release \
             -shared \
-            -prefix '$(HOST_PREFIX)' \
+            $($(PKG)_CONFIGURE_PREFIX_OPTION) \
             -hostprefix '$(BUILD_TOOLS_PREFIX)' \
             -no-icu \
             -opengl desktop \