# HG changeset patch # User Mark Brand # Date 1347962402 -7200 # Node ID 8fbf0cc2ca6f0fff8a3e2d4b9ddad98bebcd90db # Parent f3055fc0f798497c383dc20d8e130e4cc821914b package qt: install under qt prefix This makes room for Qt 5.0 when it is released and added to MXE. Expect to install Qt 5.0 under qt5 prefix. diff -r f3055fc0f798 -r 8fbf0cc2ca6f src/qt.mk --- a/src/qt.mk Tue Sep 18 10:31:39 2012 +0200 +++ b/src/qt.mk Tue Sep 18 12:00:02 2012 +0200 @@ -33,7 +33,7 @@ -release \ -exceptions \ -static \ - -prefix '$(PREFIX)/$(TARGET)' \ + -prefix '$(PREFIX)/$(TARGET)/qt' \ -prefix-install \ -script \ -no-iconv \ @@ -65,12 +65,12 @@ -v $(MAKE) -C '$(1)' -j '$(JOBS)' - rm -rf '$(PREFIX)/$(TARGET)/mkspecs' + rm -rf '$(PREFIX)/$(TARGET)/qt' $(MAKE) -C '$(1)' -j 1 install - $(INSTALL) -m755 '$(1)/bin/moc' '$(PREFIX)/bin/$(TARGET)-moc' - $(INSTALL) -m755 '$(1)/bin/rcc' '$(PREFIX)/bin/$(TARGET)-rcc' - $(INSTALL) -m755 '$(1)/bin/uic' '$(PREFIX)/bin/$(TARGET)-uic' - $(INSTALL) -m755 '$(1)/bin/qmake' '$(PREFIX)/bin/$(TARGET)-qmake' + ln -fs '$(PREFIX)/$(TARGET)/qt/bin/moc' '$(PREFIX)/bin/$(TARGET)-moc' + ln -fs '$(PREFIX)/$(TARGET)/qt/bin/rcc' '$(PREFIX)/bin/$(TARGET)-roc' + ln -fs '$(PREFIX)/$(TARGET)/qt/bin/uic' '$(PREFIX)/bin/$(TARGET)-uic' + ln -fs '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)-qmake' cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install