Mercurial > mxe-octave
diff src/qt.mk @ 3218:8ede5874e2f1
qt.mk: use make conditional
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 07 Aug 2013 08:33:18 -0400 |
parents | 11f8ec654cd4 |
children | ed6444cc0dcb |
line wrap: on
line diff
--- a/src/qt.mk Wed Aug 07 00:42:00 2013 -0400 +++ b/src/qt.mk Wed Aug 07 08:33:18 2013 -0400 @@ -171,18 +171,16 @@ cp -f '$(1)/lib/pkgconfig/'*.pc '$(HOST_LIBDIR)/pkgconfig/'; \ fi - if [ $(MXE_SYSTEM) != msvc ]; then \ - if [ $(MXE_NATIVE_BUILD) = no ]; then \ - $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'; \ - $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'; \ - $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'; \ - $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'; \ - fi + $(if $(filter-out msvc, $(MXE_SYSTEM)), + $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), + $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' + $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' + $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' + fi) # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install - if [ $(MXE_NATIVE_BUILD) = no ]; then \ - $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'); \ - fi - fi + $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), + $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease')) endef