# HG changeset patch
# User John Donoghue
# Date 1426622583 14400
# Node ID c55d9f182272e7fa582dc76b8a26e2c9a2e8eb29
# Parent  e8571962313f57d596eba5f2edcd531b71bbd057
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

diff -r e8571962313f -r c55d9f182272 Makefile.in
--- a/Makefile.in	Sat Mar 07 14:07:33 2015 -0500
+++ b/Makefile.in	Tue Mar 17 16:03:03 2015 -0400
@@ -305,8 +305,10 @@
     MXE_QMAKE := qmake
   endif
 
-  MXE_MOC := moc
-  MXE_UIC := uic
+  MXE_MOC := $(HOST_BINDIR)/moc
+  MXE_UIC := $(HOST_BINDIR)/uic
+  MXE_LRELEASE := $(HOST_BINDIR)/lrelease
+  MXE_RCC := $(HOST_BINDIR)/rcc
 else
   MXE_TOOL_PREFIX := $(TARGET)-
   MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
@@ -327,6 +329,8 @@
   MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
   MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
   MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
+  MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
+  MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
diff -r e8571962313f -r c55d9f182272 src/default-octave.mk
--- a/src/default-octave.mk	Sat Mar 07 14:07:33 2015 -0500
+++ b/src/default-octave.mk	Tue Mar 17 16:03:03 2015 -0400
@@ -44,10 +44,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
diff -r e8571962313f -r c55d9f182272 src/octave.mk
--- a/src/octave.mk	Sat Mar 07 14:07:33 2015 -0500
+++ b/src/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
diff -r e8571962313f -r c55d9f182272 src/stable-octave.mk
--- 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