diff options
| author | Luís Pereira <luis.artur.pereira@gmail.com> | 2013-08-27 10:42:37 -0700 |
|---|---|---|
| committer | Luís Pereira <luis.artur.pereira@gmail.com> | 2013-08-28 14:28:08 +0200 |
| commit | 10517652f65f05120432ea05883977e39ed7b8be (patch) | |
| tree | 3165a410ce5d2ab6856bfd631344bc19ab043e88 | |
| parent | 4dd23283954158b7c50de88239c6eb965a509bcf (diff) | |
Fixes development header and lib install directory
PREFIX variable added. Let packagers and users choose the install prefix.
Headers installed to $${INCLUDEDIR}/QtMimeTypes. Installing it to
$${INCLUDEDIR}/qt5/QtMimeTypes makes no sense. This is an Qt4 project.
Libraries installed to $${LIBDIR}.
maemo5 "special" include and lib path dropped. Just use the PREFIX
variable.
Use example:
qmake PREFIX=/usr/local
Change-Id: I4fc173e7999ea7ffdd4dfe26f8a142a822fa7da9
Signed-off-by: Luís Pereira <luis.artur.pereira@gmail.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
| -rw-r--r-- | include/QtMimeTypes/QtMimeTypes.pro | 8 | ||||
| -rw-r--r-- | mimetypes-nolibs.pri | 12 | ||||
| -rw-r--r-- | qtmimetypes.pro | 1 | ||||
| -rw-r--r-- | src/mimetypes/mimetypes.pro | 9 |
4 files changed, 18 insertions, 12 deletions
diff --git a/include/QtMimeTypes/QtMimeTypes.pro b/include/QtMimeTypes/QtMimeTypes.pro index 66fabb4..a979987 100644 --- a/include/QtMimeTypes/QtMimeTypes.pro +++ b/include/QtMimeTypes/QtMimeTypes.pro @@ -1,3 +1,5 @@ +include(../../mimetypes-nolibs.pri) + contains($$list($$[QT_VERSION]),4.[6-9].*) { TEMPLATE = subdirs } else { @@ -8,10 +10,6 @@ the_includes.files += QMimeDatabase \ QMimeType \ unix:!symbian { - maemo5 { - the_includes.path = /opt/usr/include/qt5/QtMimeTypes - } else { - the_includes.path = /usr/include/qt5/QtMimeTypes - } + the_includes.path = $${INCLUDEDIR}/QtMimeTypes INSTALLS += the_includes } diff --git a/mimetypes-nolibs.pri b/mimetypes-nolibs.pri index c77a2c1..b0d9052 100644 --- a/mimetypes-nolibs.pri +++ b/mimetypes-nolibs.pri @@ -1,3 +1,6 @@ +!isEmpty(MIMETYPES_PRI_INCLUDED):error("mimetypes-no-libs.pri already included") +MIMETYPES_PRI_INCLUDED = 1 + INCLUDEPATH += $$PWD/include/QtMimeTypes INCLUDEPATH += $$PWD/src/mimetypes/inqt5 INCLUDEPATH += $$PWD/src/mimetypes $$PWD/src/imports/mimetypes @@ -9,3 +12,12 @@ mac|darwin: { } else { QMAKE_CXXFLAGS += -std=c++0x } + +unix { + isEmpty(PREFIX) { + PREFIX = /usr + } + + INCLUDEDIR = $${PREFIX}/include + LIBDIR = ${{PREFIX}/lib +} diff --git a/qtmimetypes.pro b/qtmimetypes.pro index 007371a..5beb5f4 100644 --- a/qtmimetypes.pro +++ b/qtmimetypes.pro @@ -1,3 +1,4 @@ +include(mimetypes-nolibs.pri) include(doc/doc.pri) # check qt version diff --git a/src/mimetypes/mimetypes.pro b/src/mimetypes/mimetypes.pro index abe8dc1..1289aae 100644 --- a/src/mimetypes/mimetypes.pro +++ b/src/mimetypes/mimetypes.pro @@ -61,12 +61,7 @@ symbian { } unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - the_includes.path = /opt/usr/include/qt5/QtMimeTypes - } else { - target.path = /usr/lib - the_includes.path = /usr/include/qt5/QtMimeTypes - } + target.path = ${{LIBDIR} + the_includes.path = $${INCLUDEDIR}/QtMimeTypes INSTALLS += target the_includes } |