From c6e19f3d19a707deee31eff8623d0ca9a5b750df Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 5 May 2015 10:04:43 +0200 Subject: [PATCH] Move includedir to /usr/include/libi2ncommon Some of our header filenames are very generic, so let's group them in an own subdirectory. --- CMakeLists.txt | 2 +- configlib/CMakeLists.txt | 2 +- libi2ncommon.spec | 2 +- src/CMakeLists.txt | 2 +- utils/CMakeLists.txt | 2 +- xmllib/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a721409..b471108 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ endif(IMAP_UTF7_SUPPORT) # pkgconfig output set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(includedir ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) # construct ${BOOST_LDADD} from ${Boost_LIBRARIES} diff --git a/configlib/CMakeLists.txt b/configlib/CMakeLists.txt index c24f6cc..f0af069 100644 --- a/configlib/CMakeLists.txt +++ b/configlib/CMakeLists.txt @@ -18,5 +18,5 @@ install(TARGETS i2ncommon_config COMPONENT sharedlibs) install(FILES ${cpp_headers} - DESTINATION include + DESTINATION include/${PROJECT_NAME} COMPONENT headers) diff --git a/libi2ncommon.spec b/libi2ncommon.spec index 704d493..c4711d6 100644 --- a/libi2ncommon.spec +++ b/libi2ncommon.spec @@ -122,7 +122,7 @@ rm -fr $RPM_BUILD_ROOT #%{prefix}/lib/*.*a* %{_libdir}/libi2ncommon.so %{_libdir}/pkgconfig/*.pc -%{_includedir}/* +%{_includedir}/libi2ncommon/* %files config %defattr(-,root,root) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 144a88c..2fb58ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,5 +66,5 @@ install(TARGETS i2ncommon COMPONENT sharedlibs) install(FILES ${cpp_headers} - DESTINATION include + DESTINATION include/${PROJECT_NAME} COMPONENT headers) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index d87b9fb..b2e0d2b 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -20,5 +20,5 @@ install(TARGETS i2ncommon_utils COMPONENT sharedlibs) install(FILES ${cpp_headers} - DESTINATION include + DESTINATION include/${PROJECT_NAME} COMPONENT headers) diff --git a/xmllib/CMakeLists.txt b/xmllib/CMakeLists.txt index e02f168..4e3902d 100644 --- a/xmllib/CMakeLists.txt +++ b/xmllib/CMakeLists.txt @@ -23,5 +23,5 @@ install(TARGETS i2ncommon_xml COMPONENT sharedlibs) install(FILES ${cpp_headers} - DESTINATION include + DESTINATION include/${PROJECT_NAME} COMPONENT headers) -- 1.7.1