From 701f861a736fd7acf2f0e79de95c6e1fe5499fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= Date: Thu, 4 Jul 2024 08:41:29 +0300 Subject: [PATCH] vendor: mkbootimg: Use builtin ${CMAKE_INSTALL_BINDIR} instead of relative bin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now the bin directory can be changed using standard cmake means. Signed-off-by: Björn Bidar --- vendor/CMakeLists.mkbootimg.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/CMakeLists.mkbootimg.txt b/vendor/CMakeLists.mkbootimg.txt index 440298b..7f8dfa8 100644 --- a/vendor/CMakeLists.mkbootimg.txt +++ b/vendor/CMakeLists.mkbootimg.txt @@ -1,9 +1,9 @@ -set(MKBOOTIMG_SCRIPTS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/android-tools/mkbootimg") +set(MKBOOTIMG_SCRIPTS_DIR ${CMAKE_INSTALL_FULL_DATADIR}/android-tools/mkbootimg) install(PROGRAMS mkbootimg/mkbootimg.py DESTINATION ${MKBOOTIMG_SCRIPTS_DIR}) add_custom_target(mkbootimg_symlink ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${MKBOOTIMG_SCRIPTS_DIR}/mkbootimg.py ${CMAKE_CURRENT_BINARY_DIR}/mkbootimg) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mkbootimg DESTINATION bin) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mkbootimg DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES mkbootimg/gki/generate_gki_certificate.py DESTINATION ${MKBOOTIMG_SCRIPTS_DIR}/gki) -install(PROGRAMS mkbootimg/unpack_bootimg.py DESTINATION bin RENAME unpack_bootimg) -install(PROGRAMS mkbootimg/repack_bootimg.py DESTINATION bin RENAME repack_bootimg) +install(PROGRAMS mkbootimg/unpack_bootimg.py DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME unpack_bootimg) +install(PROGRAMS mkbootimg/repack_bootimg.py DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME repack_bootimg)