| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | [PATCH] fix the CMAKE_INSTALL_LIBDIR |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | libdir maybe /usr/lib64 for 64bit machine |
| 6 | |
| 7 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 8 | --- |
| 9 | CMakeLists.txt | 8 ++++---- |
| 10 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 11 | |
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 13 | index 57804cf..2c7bdc1 100644 |
| 14 | --- a/CMakeLists.txt |
| 15 | +++ b/CMakeLists.txt |
| 16 | @@ -35,8 +35,8 @@ INSTALL(FILES ${headers} |
| 17 | DESTINATION include/libubox |
| 18 | ) |
| 19 | INSTALL(TARGETS ubox ubox-static |
| 20 | - ARCHIVE DESTINATION lib |
| 21 | - LIBRARY DESTINATION lib |
| 22 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 23 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 24 | ) |
| 25 | |
| 26 | ADD_SUBDIRECTORY(lua) |
| 27 | @@ -58,8 +58,8 @@ IF(EXISTS ${json}) |
| 28 | TARGET_LINK_LIBRARIES(json_script ubox) |
| 29 | |
| 30 | INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script |
| 31 | - ARCHIVE DESTINATION lib |
| 32 | - LIBRARY DESTINATION lib |
| 33 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 34 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 35 | RUNTIME DESTINATION bin |
| 36 | ) |
| 37 | |
| 38 | -- |
| 39 | 1.9.1 |
| 40 | |