tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index cdf22c4b0fc8..8def776f2b4a 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH
6 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
7 )
8
9+include(GNUInstallDirs)
10+
11 include(LLDBStandalone)
12 include(LLDBConfig)
13 include(AddLLDB)
14diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
15index f82c11d3d317..776e6d6ef9de 100644
16--- a/cmake/modules/AddLLDB.cmake
17+++ b/cmake/modules/AddLLDB.cmake
18@@ -63,18 +63,18 @@ function(add_lldb_library name)
19 set(install_dir ".")
20 endif()
21 else()
22- set(install_dir lib${LLVM_LIBDIR_SUFFIX})
23+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
24 endif()
25 install(TARGETS ${name}
26 COMPONENT ${name}
27- RUNTIME DESTINATION bin
28+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
29 LIBRARY DESTINATION ${install_dir}
30 ARCHIVE DESTINATION ${install_dir})
31 else()
32 install(TARGETS ${name}
33 COMPONENT ${name}
34- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
35- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
36+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
37+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
38 endif()
39 if (NOT CMAKE_CONFIGURATION_TYPES)
40 add_llvm_install_targets(install-${name}
41@@ -122,7 +122,7 @@ function(add_lldb_executable name)
42 if(ARG_GENERATE_INSTALL)
43 install(TARGETS ${name}
44 COMPONENT ${name}
45- RUNTIME DESTINATION bin)
46+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
47 if (NOT CMAKE_CONFIGURATION_TYPES)
48 add_llvm_install_targets(install-${name}
49 DEPENDS ${name}
50diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
51index 109c5132d3be..8b9092faa29d 100644
52--- a/cmake/modules/LLDBConfig.cmake
53+++ b/cmake/modules/LLDBConfig.cmake
54@@ -319,7 +319,7 @@ include_directories(BEFORE
55 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
56 install(DIRECTORY include/
57 COMPONENT lldb-headers
58- DESTINATION include
59+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
60 FILES_MATCHING
61 PATTERN "*.h"
62 PATTERN ".svn" EXCLUDE
63@@ -329,7 +329,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
64
65 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
66 COMPONENT lldb-headers
67- DESTINATION include
68+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
69 FILES_MATCHING
70 PATTERN "*.h"
71 PATTERN ".svn" EXCLUDE
72diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
73index b5316540fdf3..3c3c882d503f 100644
74--- a/tools/intel-features/CMakeLists.txt
75+++ b/tools/intel-features/CMakeLists.txt
76@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT)
77 endif()
78
79 install(TARGETS lldbIntelFeatures
80- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
81+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})