Mercurial > mxe-octave
comparison src/stable-octave.mk @ 3849:e50c777c9a97
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 | 02990526ae69 |
children | c55d9f182272 |
comparison
equal
deleted
inserted
replaced
3848:e2f0a87790ca | 3849:e50c777c9a97 |
---|---|
35 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \ | 35 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \ |
36 --with-java-includedir="$(HOST_INCDIR)/java" | 36 --with-java-includedir="$(HOST_INCDIR)/java" |
37 endif | 37 endif |
38 endif | 38 endif |
39 endif | 39 endif |
40 | |
41 ## If we allow the system Qt libraries to be used, then these | |
42 ## won't make sense. | |
43 $(PKG)_QT_CONFIGURE_OPTIONS := \ | |
44 MOC=$(HOST_BINDIR)/moc \ | |
45 UIC=$(HOST_BINDIR)/uic \ | |
46 RCC=$(HOST_BINDIR)/rcc \ | |
47 LRELEASE=$(HOST_BINDIR)/lrelease | |
40 | 48 |
41 ifneq ($(ENABLE_DOCS),yes) | 49 ifneq ($(ENABLE_DOCS),yes) |
42 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs | 50 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs |
43 endif | 51 endif |
44 | 52 |
111 $($(PKG)_CROSS_CONFIG_OPTIONS) \ | 119 $($(PKG)_CROSS_CONFIG_OPTIONS) \ |
112 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ | 120 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ |
113 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ | 121 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ |
114 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ | 122 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ |
115 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ | 123 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ |
124 $($(PKG)_QT_CONFIGURE_OPTIONS) \ | |
116 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ | 125 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ |
117 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ | 126 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ |
118 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ | 127 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ |
119 && $(CONFIGURE_POST_HOOK) | 128 && $(CONFIGURE_POST_HOOK) |
120 | 129 |