--- CMakeLists.txt.orig	2019-05-29 15:36:34 UTC
+++ CMakeLists.txt
@@ -64,7 +64,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC
 	set(CROSSGUID_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 	set(CROSSGUID_FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 
-	set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid/cmake")
+	set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/crossguid/")
 	set(CROSSGUID_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid")
 
 	# Install target
@@ -75,7 +75,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC
 		FRAMEWORK     DESTINATION ${CROSSGUID_FRAMEWORK_INSTALL_DIR})
 
 	# Install headers
-	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/crossguid/"
 		DESTINATION ${CROSSGUID_INC_INSTALL_DIR})
 
 	# Make cmake config files for all targets