From 821a0dcfadc6ce0af16f38e960b63794d288c3b4 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 30 Jan 2014 17:00:54 +0100 Subject: Qt4, Qt5: create symlinks $(TARGET)-qmake-qtX in $(PREFIX)/bin That way a configure script looking for "qmake-qt4" or "qmake-qt5" with AC_PATH_PROG will find e.g. x86_64-w64-mingw32-qmake-qt5 properly. See http://thread.gmane.org/gmane.comp.gnu.mingw.cross-env/3424/focus=3426 --- src/qt.mk | 1 + src/qtbase.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/src/qt.mk b/src/qt.mk index be01527..d10a99e 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -69,6 +69,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' rm -rf '$(PREFIX)/$(TARGET)/qt' $(MAKE) -C '$(1)' -j 1 install + ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4 cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install diff --git a/src/qtbase.mk b/src/qtbase.mk index 4b731c4..855b38a 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -56,6 +56,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' QMAKE="$(1)/bin/qmake CONFIG-='debug debug_and_release'" rm -rf '$(PREFIX)/$(TARGET)/qt5' $(MAKE) -C '$(1)' -j 1 install + ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5 mkdir '$(1)/test-qt' cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' -- cgit v0.12