commit ab37b2cf2981c29e2c14ac0815df34d567359134 Author: hasufell Date: Sat Dec 28 20:53:23 2013 +0100 fix pkg-config files * includedir was incorrectly set and now matches the cmake module, wrt https://bugs.kde.org/show_bug.cgi?id=297340 * removed redundancy from polkit-qt-1.pc * added polkit_policy_files_install_dir variable (from cmake module) * use $prefix instead of @CMAKE_INSTALL_PREFIX@ multiple times diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake index 0d7bd08..075bef4 100644 --- a/polkit-qt-1.pc.cmake +++ b/polkit-qt-1.pc.cmake @@ -1,11 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=${prefix}/include +polkit_includedir=${includedir}/polkit-qt-1 +polkit_policy_files_install_dir=${prefix}/share/polkit-1/actions Name: polkit-qt-1 Description: Convenience library for using polkit with a Qt-styled API Version: @POLKITQT-1_VERSION_STRING@ Requires: polkit-qt-core-1 polkit-qt-gui-1 polkit-qt-agent-1 -Libs: -L${libdir} -lpolkit-qt-core-1 -lpolkit-qt-gui-1 -lpolkit-qt-agent-1 -Cflags: -I${includedir} +Libs: -L${libdir} +Cflags: -I${polkit_includedir} diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake index 09f9323..4d1879a 100644 --- a/polkit-qt-agent-1.pc.cmake +++ b/polkit-qt-agent-1.pc.cmake @@ -1,11 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=${prefix}/include +polkit_includedir=${includedir}/polkit-qt-1 +polkit_policy_files_install_dir=${prefix}/share/polkit-1/actions Name: polkit-qt-agent-1 Description: Convenience library for using polkit Agent with a Qt-styled API Version: @POLKITQT-1_VERSION_STRING@ Requires: QtCore QtGui Libs: -L${libdir} -lpolkit-qt-agent-1 -Cflags: -I${includedir} +Cflags: -I${polkit_includedir} diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake index f553b7b..4a32bde 100644 --- a/polkit-qt-core-1.pc.cmake +++ b/polkit-qt-core-1.pc.cmake @@ -1,11 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=${prefix}/include +polkit_includedir=${includedir}/polkit-qt-1 +polkit_policy_files_install_dir=${prefix}/share/polkit-1/actions Name: polkit-qt-core-1 Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes Version: @POLKITQT-1_VERSION_STRING@ Requires: QtCore Libs: -L${libdir} -lpolkit-qt-core-1 -Cflags: -I${includedir} +Cflags: -I${polkit_includedir} diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake index 83d4e9a..e14a07a 100644 --- a/polkit-qt-gui-1.pc.cmake +++ b/polkit-qt-gui-1.pc.cmake @@ -1,11 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=${prefix}/include +polkit_includedir=${includedir}/polkit-qt-1 +polkit_policy_files_install_dir=${prefix}/share/polkit-1/actions Name: polkit-qt-gui-1 Description: Convenience library for using polkit with a Qt-styled API, GUI classes Version: @POLKITQT-1_VERSION_STRING@ Requires: QtCore QtGui polkit-qt-core-1 Libs: -L${libdir} -lpolkit-qt-gui-1 -Cflags: -I${includedir} +Cflags: -I${polkit_includedir}