Mercurial > mxe-octave
comparison 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 |
comparison
equal
deleted
inserted
replaced
3850:e8571962313f | 3851:c55d9f182272 |
---|---|
39 endif | 39 endif |
40 | 40 |
41 ## If we allow the system Qt libraries to be used, then these | 41 ## If we allow the system Qt libraries to be used, then these |
42 ## won't make sense. | 42 ## won't make sense. |
43 $(PKG)_QT_CONFIGURE_OPTIONS := \ | 43 $(PKG)_QT_CONFIGURE_OPTIONS := \ |
44 MOC=$(HOST_BINDIR)/moc \ | 44 MOC=$(MXE_MOC) \ |
45 UIC=$(HOST_BINDIR)/uic \ | 45 UIC=$(MXE_UIC) \ |
46 RCC=$(HOST_BINDIR)/rcc \ | 46 RCC=$(MXE_RCC) \ |
47 LRELEASE=$(HOST_BINDIR)/lrelease | 47 LRELEASE=$(MXE_LRELEASE) |
48 | 48 |
49 ifneq ($(ENABLE_DOCS),yes) | 49 ifneq ($(ENABLE_DOCS),yes) |
50 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs | 50 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs |
51 endif | 51 endif |
52 | 52 |