# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1508418014 14400
# Node ID 8e522798c9a7e1c4807149df221626996426c235
# Parent  e575e2afdae4429fb23bbd06dd027b712f14f087
qscintilla: simplify DLL install rules

diff -r e575e2afdae4 -r 8e522798c9a7 src/qscintilla.mk
--- a/src/qscintilla.mk	Thu Oct 19 08:56:52 2017 -0400
+++ b/src/qscintilla.mk	Thu Oct 19 09:00:14 2017 -0400
@@ -63,18 +63,14 @@
         $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
     fi
 
-    if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \
-        $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib'; \
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/bin/'; \
-        rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll'; \
+    if [ $(MXE_SYSTEM) = mingw ]; then \
+      $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
+      if [ $(ENABLE_QT5) = yes ]; then \
+        mv '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/qscintilla2_qt5.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
+      else \
+        mv '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/qscintilla2_qt4.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
+      fi; \
     fi
-    if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \
-        $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
-        $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
-        rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll'; \
-	$(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2_qt4.a' '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2.a'; \
-    fi
-
 
     # Qmake under MSVC uses Win32 paths. When combining this with
     # DESTDIR usage (or equivalent), the real Win32 directory hierarchy