Mercurial > mxe-octave

comparison src/qscintilla.mk @ 4517:8e522798c9a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: simplify DLL install rules
author John W. Eaton <jwe@octave.org>
date Thu, 19 Oct 2017 09:00:14 -0400
parents bb63484e88ae
children 0664d54897b4
comparison
equal deleted inserted replaced
4516:e575e2afdae4 4517:8e522798c9a7
61 else \ 61 else \
62 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \ 62 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
63 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \ 63 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
64 fi 64 fi
65 65
66 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \ 66 if [ $(MXE_SYSTEM) = mingw ]; then \
67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib'; \ 67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
68 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/bin/'; \ 68 if [ $(ENABLE_QT5) = yes ]; then \
69 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2_qt5$(LIBRARY_SUFFIX).dll'; \ 69 mv '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/qscintilla2_qt5.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
70 else \
71 mv '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/qscintilla2_qt4.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
72 fi; \
70 fi 73 fi
71 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \
72 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
73 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
74 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2_qt4$(LIBRARY_SUFFIX).dll'; \
75 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2_qt4.a' '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/libqscintilla2.a'; \
76 fi
77
78 74
79 # Qmake under MSVC uses Win32 paths. When combining this with 75 # Qmake under MSVC uses Win32 paths. When combining this with
80 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy 76 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy
81 # is recreated under DESTDIR, not the MSYS hierarchy. 77 # is recreated under DESTDIR, not the MSYS hierarchy.
82 if [ $(MXE_SYSTEM) = msvc ]; then \ 78 if [ $(MXE_SYSTEM) = msvc ]; then \