From 67e197a3db8db6177160884cd6328a5b31e40b64 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 Dec 2010 14:11:48 +0200 Subject: [PATCH] Fix up pkgconfig and qtconfig files --- lib/lib.pro | 6 +++--- lib/ofono-qt.prf | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/lib.pro b/lib/lib.pro index d9217bb..ab8d75a 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -56,10 +56,10 @@ headers.path = $$[QT_INSTALL_PREFIX]/include/ofono-qt CONFIG += create_pc create_prl -pkgconfig.path = $$[QT_INSTALL_PREFIX]/lib/pkgconfig -pkgconfig.files = ofono-qt.pc +QMAKE_PKGCONFIG_DESTDIR = pkgconfig +QMAKE_PKGCONFIG_INCDIR = $$headers.path qtconfig.path = $$[QT_INSTALL_PREFIX]/share/qt4/mkspecs/features qtconfig.files = ofono-qt.prf -INSTALLS += target headers pkgconfig qtconfig +INSTALLS += target headers qtconfig diff --git a/lib/ofono-qt.prf b/lib/ofono-qt.prf index b447419..80ede41 100644 --- a/lib/ofono-qt.prf +++ b/lib/ofono-qt.prf @@ -1,9 +1,7 @@ prefix=/usr exec_prefix=$${prefix} -DEPENDPATH += $${prefix}/include DEPENDPATH += $${prefix}/include/ofono-qt -INCLUDEPATH += $${prefix}/include INCLUDEPATH += $${prefix}/include/ofono-qt LIBS += -L $${exec_prefix}/lib -lofono-qt -- 2.7.4