1From fe4f3c2a37a81201f463ff962364f014f50c9896 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Mon, 16 Dec 2019 22:58:41 -0800 4Subject: [PATCH] Use CMAKE_INSTALL_<path> instead of hardcoding bin/lib/ 5 install paths 6 7Helps fix build/packaging issues on machines where default libdir is not 8lib but say lib64 9 10Upstream-Status: Submitted [https://github.com/tinyalsa/tinyalsa/pull/143] 11Signed-off-by: Khem Raj <raj.khem@gmail.com> 12--- 13 CMakeLists.txt | 14 +++++++++++--- 14 1 file changed, 11 insertions(+), 3 deletions(-) 15 16diff --git a/CMakeLists.txt b/CMakeLists.txt 17index cb31c58..1cc4a85 100644 18--- a/CMakeLists.txt 19+++ b/CMakeLists.txt 20@@ -41,12 +41,20 @@ add_util("tinymix" "utils/tinymix.c") 21 install(FILES ${HDRS} 22 DESTINATION "include/tinyalsa") 23 24+if(NOT DEFINED CMAKE_INSTALL_LIBDIR) 25+ set(CMAKE_INSTALL_LIBDIR lib) 26+endif() 27+ 28+if(NOT DEFINED CMAKE_INSTALL_BINDIR) 29+ set(CMAKE_INSTALL_BINDIR bin) 30+endif() 31+ 32 install(TARGETS "tinyalsa" 33 "tinyplay" 34 "tinycap" 35 "tinymix" 36 "tinypcminfo" 37- RUNTIME DESTINATION "bin" 38- ARCHIVE DESTINATION "lib" 39- LIBRARY DESTINATION "lib") 40+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 41+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} 42+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 43 44-- 452.24.1 46 47