diff src/stable-octave.mk @ 3851:c55d9f182272

use MXE_XXXX tools for octave qt compiling (Bug 44563) * Makefile.in: add cross/native MXE_UIC,MOC,LRELEASE,RCC variables where missing * src/octave.mk, src/default-octave.mk, src/stable-octave.mk: use MXE_XXX qt tools
author John Donoghue
date Tue, 17 Mar 2015 16:03:03 -0400
parents e50c777c9a97
children 1cab2860069e
line wrap: on
line diff
--- a/src/stable-octave.mk	Sat Mar 07 14:07:33 2015 -0500
+++ b/src/stable-octave.mk	Tue Mar 17 16:03:03 2015 -0400
@@ -41,10 +41,10 @@
 ## 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
+  MOC=$(MXE_MOC) \
+  UIC=$(MXE_UIC) \
+  RCC=$(MXE_RCC) \
+  LRELEASE=$(MXE_LRELEASE)
 
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs