Skip to content

Commit 00393b2

Browse files
authored
dtoverlay, vcgencmd, vcmailbox: fix build locations
Use the install location variables provided by GNUInstallDirs.
1 parent a8ff215 commit 00393b2

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

dtmerge/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ install(FILES dtmerge.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
2121

2222
add_executable(dtoverlay dtoverlay_main.c utils.c)
2323
target_link_libraries(dtoverlay dtovl)
24-
install(TARGETS dtoverlay RUNTIME DESTINATION bin)
25-
install(FILES dtoverlay.1 DESTINATION man/man1)
24+
install(TARGETS dtoverlay RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
25+
install(FILES dtoverlay.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
2626

2727
add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
28-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
29-
install(FILES dtparam.1 DESTINATION man/man1)
28+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION ${CMAKE_INSTALL_BINDIR})
29+
install(FILES dtparam.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
3030

3131
set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
32-
install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
32+
install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION ${CMAKE_INSTALL_BINDIR})

vcgencmd/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
5+
#set project name
6+
project(vcgencmd)
7+
38
add_executable(vcgencmd vcgencmd.c)
4-
install(TARGETS vcgencmd RUNTIME DESTINATION bin)
5-
install(FILES vcgencmd.1 DESTINATION man/man1)
9+
install(TARGETS vcgencmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
10+
install(FILES vcgencmd.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

vcmailbox/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
5+
#set project name
6+
project(vcmailbox)
7+
38
add_executable(vcmailbox vcmailbox.c)
49
target_link_libraries(vcmailbox)
510

6-
install(TARGETS vcmailbox RUNTIME DESTINATION bin)
7-
install(FILES vcmailbox.1 DESTINATION man/man1)
8-
install(FILES vcmailbox.7 raspiotp.7 raspirev.7 DESTINATION man/man7)
11+
install(TARGETS vcmailbox RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
12+
install(FILES vcmailbox.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
13+
install(FILES vcmailbox.7 raspiotp.7 raspirev.7 DESTINATION ${CMAKE_INSTALL_MANDIR}/man7)

0 commit comments

Comments
 (0)