Mercurial > mxe-octave

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