Index: dolfin/dolfin/CMakeLists.txt
===================================================================
--- dolfin.orig/dolfin/CMakeLists.txt
+++ dolfin/dolfin/CMakeLists.txt
@@ -223,7 +223,7 @@ install(TARGETS dolfin EXPORT DOLFINTarg
   ARCHIVE DESTINATION ${DOLFIN_LIB_DIR} COMPONENT Development
   )
 
-install(EXPORT DOLFINTargets DESTINATION ${DOLFIN_SHARE_DIR}/cmake)
+install(EXPORT DOLFINTargets DESTINATION ${DOLFIN_CMAKE_INSTALL_DIR})
 
 #------------------------------------------------------------------------------
 # Generate CMake config files (DOLFINConfig{,Version}.cmake)
@@ -242,7 +242,7 @@ install(
   ${CMAKE_BINARY_DIR}/dolfin/DOLFINConfig.cmake
   ${CMAKE_BINARY_DIR}/dolfin/DOLFINConfigVersion.cmake
   ${CMAKE_BINARY_DIR}/dolfin/UseDOLFIN.cmake
-  DESTINATION ${DOLFIN_SHARE_DIR}/cmake
+  DESTINATION ${DOLFIN_CMAKE_INSTALL_DIR}
   COMPONENT Development)
 
 #------------------------------------------------------------------------------
Index: dolfin/CMakeLists.txt
===================================================================
--- dolfin.orig/CMakeLists.txt
+++ dolfin/CMakeLists.txt
@@ -511,6 +511,7 @@ include(GNUInstallDirs)
 
 # Set DOLFIN install sub-directories
 set(DOLFIN_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Binary installation directory.")
+set(DOLFIN_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/dolfin" CACHE PATH "cmake dev file installation directory.")
 set(DOLFIN_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Library installation directory.")
 set(DOLFIN_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "C/C++ header installation directory.")
 set(DOLFIN_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "pkg-config file installation directory.")