From e02668556ee323ded14047e1b0e5230309a39490 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Wed, 2 Nov 2011 16:27:07 +0100
Subject: minor cmake fixes

---
 src/CMakeLists.txt   | 6 +++---
 src/libChooser.pc.in | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b52e552..f2ffdd0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ install(TARGETS Chooser_static Chooser_shared
   ARCHIVE DESTINATION lib COMPONENT libs
 )
 
-install(FILES ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_HEADERS} DESTINATION include COMPONENT dev)
+install(FILES ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_HEADERS} DESTINATION include/libChooser COMPONENT dev)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libChooser.pc" DESTINATION "share/pkgconfig" COMPONENT libs)
 
 set(CPACK_COMPONENTS_ALL libs dev)
@@ -45,9 +45,9 @@ set(CPACK_PACKAGE_DESCRIPTION "...")
 set(CPACK_PACKAGE_VERSION "${libChooser_VERSION_MAJOR}.${libChooser_VERSION_MINOR}.${libChooser_VERSION_PATCH}")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtcore4")
 set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
-set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}_oneiric")
+set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
 set(CPACK_PACKAGE_NAME "libChooser")
-set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i686")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 set(CPACK_PACKAGE_FILE_NAME  "libChooser_${CPACK_PACKAGE_VERSION}_ubuntu_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "libChooser_${CPACK_PACKAGE_VERSION}")
 
diff --git a/src/libChooser.pc.in b/src/libChooser.pc.in
index db45444..a470aa9 100644
--- a/src/libChooser.pc.in
+++ b/src/libChooser.pc.in
@@ -6,5 +6,5 @@ libdir=@CMAKE_INSTALL_PREFIX@/lib
 Name: libChooser
 Description: The libChooser library
 Version: @libChooser_VERSION_MAJOR@.@libChooser_VERSION_MINOR@.@libChooser_VERSION_PATCH@
-Cflags: -I@CMAKE_INSTALL_PREFIX@/include
+Cflags: -I@CMAKE_INSTALL_PREFIX@/include/libChooser
 Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lChooser
-- 
cgit v1.2.3-55-g7522