From 258241200bb351d910f9291821179be306d5e3aa Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 22 Aug 2018 22:44:16 +0200 Subject: [PATCH] Revert "Avoid installing stuff under /usr/includes4u/" With this commit, it now work with CMAKE_INSTALL_PREFIX=/usr but does not seem to work anymore with CMAKE_INSTALL_PREFIX=/usr/ that was used earlier. So, move back to the previous bug until we find a solution working in both cases. This reverts commit 444729e5a96f255d25524754cf0b6c11a057e6b6. --- tools/cmake/Distrib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index 5a0fc10dc3..d85418fe27 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -67,7 +67,7 @@ endif() # include files foreach(file ${headers_to_install} ${generated_headers_to_install}) get_filename_component(location ${file} PATH) - string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}" "" location "${location}") + string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}") install(FILES ${file} DESTINATION ${location}) endforeach() -- 2.20.1