summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-09-18 10:00:02 (GMT)
committerMark Brand <mabrand@mabrand.nl>2012-09-18 10:00:08 (GMT)
commitfe252299ec87a03cb8b04f67eb29922b66b95ded (patch)
tree1d396a4e3d03899f57e3aec12e885180b6b480f6 /src
parent22b2cce94157688b22c8a02c6f8259623355d8f5 (diff)
downloadmxe-fe252299ec87a03cb8b04f67eb29922b66b95ded.zip
mxe-fe252299ec87a03cb8b04f67eb29922b66b95ded.tar.gz
mxe-fe252299ec87a03cb8b04f67eb29922b66b95ded.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/qt.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt.mk b/src/qt.mk
index 5e8c0f0..ecd5c8f 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -33,7 +33,7 @@ define $(PKG)_BUILD
-release \
-exceptions \
-static \
- -prefix '$(PREFIX)/$(TARGET)' \
+ -prefix '$(PREFIX)/$(TARGET)/qt' \
-prefix-install \
-script \
-no-iconv \
@@ -65,12 +65,12 @@ define $(PKG)_BUILD
-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