Commit a534a1e4 authored by Daniel Molkentin's avatar Daniel Molkentin

More work toward make install on Linux.

parent 0f20a20b
...@@ -6,6 +6,22 @@ count(TOO_OLD_LIST, 1) { ...@@ -6,6 +6,22 @@ count(TOO_OLD_LIST, 1) {
} }
linux-* {
isEmpty( LOCATION ) {
LOCATION = /usr/share
}
documentation.files += doc/qtcreator.qch
documentation.path = $$LOCATION/share/qtcreator/doc/qtcreator
share.files += share/qtcreator/*
share.parth = $$LOCATION/share/qtcreator
INSTALLS += \
documentation \
share
}
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
......
...@@ -16,6 +16,13 @@ linux-* { ...@@ -16,6 +16,13 @@ linux-* {
ISGCC33=$$(GCC33) ISGCC33=$$(GCC33)
!equals(ISGCC33, 1):QT += svg dbus !equals(ISGCC33, 1):QT += svg dbus
isEmpty( LOCATION ) {
error("app.pro: including file must define LOCATION (didn't you run qmake from the root dir?)")
}
binaries.files += bin/qtcreator
binaries.path = $$LOCATION/bin
} }
TEMPLATE = app TEMPLATE = app
......
...@@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) { ...@@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
} }
} }
linux-* {
isEmpty( LOCATION ) {
error("qworkbench.pri: including file must define LOCATION (didn't you run qmake from the root dir?)")
}
}
equals(TEST, 1) { equals(TEST, 1) {
QT +=testlib QT +=testlib
DEFINES += WITH_TESTS DEFINES += WITH_TESTS
...@@ -20,7 +26,7 @@ macx { ...@@ -20,7 +26,7 @@ macx {
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else { } else {
IDE_APP_TARGET = qtcreator IDE_APP_TARGET = qtcreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/share/qtcreator/lib
} }
IDE_APP_PATH = $$IDE_BUILD_TREE/bin IDE_APP_PATH = $$IDE_BUILD_TREE/bin
win32 { win32 {
......
...@@ -20,3 +20,8 @@ macx { ...@@ -20,3 +20,8 @@ macx {
TARGET = $$qtLibraryTarget($$TARGET) TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* {
target.path = $$LOCATION/lib/qtcreator
INSTALLS += target
}
\ No newline at end of file
...@@ -48,3 +48,10 @@ macx { ...@@ -48,3 +48,10 @@ macx {
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* {
target.path = $$LOCATION/lib/qtcreator/plugins
INSTALLS += target
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment