Mercurial > mxe-octave

changeset 4209:5f6f60e3db31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt: on native build, install mkspec and qmake files * src/qt.mk: install mkspec and qmake
author John D
date Thu, 08 Sep 2016 14:34:27 -0400
parents 8198522d93c4
children 601ff07b0776
files src/qt.mk
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Mon Sep 05 10:12:49 2016 -0400
+++ b/src/qt.mk	Thu Sep 08 14:34:27 2016 -0400
@@ -174,7 +174,13 @@
     if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes ]; then \
       mkdir -p '$($(PKG)_MKSPECS)'; \
       cp -r '$(1)/mkspecs' '$($(PKG)_MKSPECS)'; \
+      $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin'; \
       $(INSTALL) -m755 '$(1)/bin/qmake.exe' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/'; \
+    elif [ "$(MXE_NATIVE_BUILD)" = "yes" ]; then \
+      mkdir -p '$($(PKG)_MKSPECS)'; \
+      cp -r '$(1)/mkspecs' '$($(PKG)_MKSPECS)'; \
+      $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin'; \
+      $(INSTALL) $(1)/bin/qmake '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/'; \
     fi
 
     # compilation under MSVC requires the use of NMAKE, which does not