Mercurial > mxe-octave

diff src/octave.mk @ 3849:e50c777c9a97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
author John W. Eaton <jwe@octave.org>
date Sat, 07 Mar 2015 14:01:57 -0500
parents 09420fc020b4
children c55d9f182272
line wrap: on
line diff
--- a/src/octave.mk	Sat Mar 07 13:55:26 2015 -0500
+++ b/src/octave.mk	Sat Mar 07 14:01:57 2015 -0500
@@ -38,6 +38,14 @@
   endif
 endif
 
+## If we allow the system Qt libraries to be used, then these
+## won't make sense.
+$(PKG)_QT_CONFIGURE_OPTIONS := \
+  MOC=$(HOST_BINDIR)/moc \
+  UIC=$(HOST_BINDIR)/uic \
+  RCC=$(HOST_BINDIR)/rcc \
+  LRELEASE=$(HOST_BINDIR)/lrelease
+
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
@@ -113,6 +121,7 @@
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
+        $($(PKG)_QT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \