# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1508427455 14400
# Node ID c48b41efdcf453d5509c110a4bd3356b9074098b
# Parent  8e522798c9a7e1c4807149df221626996426c235
qtbase: move dll files from qt5/bin to bin

diff -r 8e522798c9a7 -r c48b41efdcf4 src/qtbase.mk
--- a/src/qtbase.mk	Thu Oct 19 09:00:14 2017 -0400
+++ b/src/qtbase.mk	Thu Oct 19 11:37:35 2017 -0400
@@ -38,6 +38,10 @@
 $(PKG)_CONFIGURE_OPTS :=
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
+  ## I haven't been able to change this to be just $(HOST_PREFIX),
+  ## though I would prefer to do that.  If it is changed, then
+  ## there are a number of other places that will need to be adjusted.
+  ## --jwe
   $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
   $(PKG)_CONFIGURE_OPTS += -no-xcb
 else
@@ -120,6 +124,32 @@
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 
+    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+      $(INSTALL) -d '$(HOST_BINDIR)'; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrentd.dll '$(HOST_BINDIR)'/Qt5Concurrentd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrent.dll '$(HOST_BINDIR)'/Qt5Concurrent.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Cored.dll '$(HOST_BINDIR)'/Qt5Cored.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Core.dll '$(HOST_BINDIR)'/Qt5Core.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBusd.dll '$(HOST_BINDIR)'/Qt5DBusd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBus.dll '$(HOST_BINDIR)'/Qt5DBus.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Guid.dll '$(HOST_BINDIR)'/Qt5Guid.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Gui.dll '$(HOST_BINDIR)'/Qt5Gui.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Networkd.dll '$(HOST_BINDIR)'/Qt5Networkd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Network.dll '$(HOST_BINDIR)'/Qt5Network.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGLd.dll '$(HOST_BINDIR)'/Qt5OpenGLd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGL.dll '$(HOST_BINDIR)'/Qt5OpenGL.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupportd.dll '$(HOST_BINDIR)'/Qt5PrintSupportd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupport.dll '$(HOST_BINDIR)'/Qt5PrintSupport.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sqld.dll '$(HOST_BINDIR)'/Qt5Sqld.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sql.dll '$(HOST_BINDIR)'/Qt5Sql.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Testd.dll '$(HOST_BINDIR)'/Qt5Testd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Test.dll '$(HOST_BINDIR)'/Qt5Test.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgetsd.dll '$(HOST_BINDIR)'/Qt5Widgetsd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgets.dll '$(HOST_BINDIR)'/Qt5Widgets.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xmld.dll '$(HOST_BINDIR)'/Qt5Xmld.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xml.dll '$(HOST_BINDIR)'/Qt5Xml.dll; \
+    fi
+
     if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \
         ln -sf '$(BUILD_TOOLS_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5; \
         ln -sf '$(BUILD_TOOLS_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \
@@ -129,4 +159,3 @@
     fi
 
 endef
-
diff -r 8e522798c9a7 -r c48b41efdcf4 src/qtsvg.mk
--- a/src/qtsvg.mk	Thu Oct 19 09:00:14 2017 -0400
+++ b/src/qtsvg.mk	Thu Oct 19 11:37:35 2017 -0400
@@ -18,4 +18,10 @@
     cd '$(1)' && '$(MXE_QMAKE)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+      $(INSTALL) -d '$(HOST_BINDIR)'; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Svgd.dll '$(HOST_BINDIR)'/Qt5Svgd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Svg.dll '$(HOST_BINDIR)'/Qt5Svg.dll; \
+    fi
 endef
diff -r 8e522798c9a7 -r c48b41efdcf4 src/qttools.mk
--- a/src/qttools.mk	Thu Oct 19 09:00:14 2017 -0400
+++ b/src/qttools.mk	Thu Oct 19 11:37:35 2017 -0400
@@ -18,5 +18,18 @@
     cd '$(1)' && '$(MXE_QMAKE)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+      $(INSTALL) -d '$(HOST_BINDIR)'; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5CLucened.dll '$(HOST_BINDIR)'/Qt5CLucened.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5CLucene.dll '$(HOST_BINDIR)'/Qt5CLucene.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Helpd.dll '$(HOST_BINDIR)'/Qt5Helpd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Help.dll '$(HOST_BINDIR)'/Qt5Help.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qdbus.exe '$(HOST_BINDIR)'/qdbus.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qdbusviewer.exe '$(HOST_BINDIR)'/qdbusviewer.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtdiag.exe '$(HOST_BINDIR)'/qtdiag.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtpaths.exe '$(HOST_BINDIR)'/qtpaths.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtplugininfo.exe '$(HOST_BINDIR)'/qtplugininfo.exe; \
+    fi
 endef