aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kapshuna <kapsh@kap.sh>2020-12-29 21:08:22 +0300
committerLeandro A. F. Pereira <leandro@hardinfo.org>2020-12-29 10:31:51 -0800
commitf6a4f52868c2404f3ad58ef04e513ffe5fa090c7 (patch)
treeba149d75be85e49f7b0d3b1cbd5ad0dc99c9d107
parent5277df98922da5e597e223841bb83213a567d2fb (diff)
Use paths provided by GNUInstallDirs everywhere
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/Translations.cmake2
-rw-r--r--config.h.cmake4
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15421f46..78d7619d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,8 +66,8 @@ if (OVRDTRROOT)
add_definitions(-DDTR_ROOT=${OVRDTRROOT})
message(STATUS "/proc/device-tree override: ${OVRDTRROOT}")
endif()
-add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
-message(STATUS "LOCALEDIR = ${CMAKE_INSTALL_PREFIX}/share/locale")
+add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}")
+message(STATUS "LOCALEDIR = ${CMAKE_INSTALL_LOCALEDIR}")
message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}")
@@ -390,6 +390,6 @@ install(FILES ${HARDINFO_MANPAGES}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
install(FILES pixmaps/hardinfo.png
- DESTINATION share/icons/hicolor/48x48/apps
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake
index dd06cee4..d729b37d 100644
--- a/cmake/Translations.cmake
+++ b/cmake/Translations.cmake
@@ -10,7 +10,7 @@ macro(add_translations_directory NLS_PACKAGE)
add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
install (FILES ${MO_OUTPUT} DESTINATION
- share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+ ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
RENAME ${NLS_PACKAGE}.mo)
endforeach (PO_INPUT ${PO_FILES})
endmacro(add_translations_directory)
diff --git a/config.h.cmake b/config.h.cmake
index 496f7535..b1e75dfa 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -11,8 +11,8 @@
#define ARCH_@HARDINFO_ARCH@
#define LIBDIR "@CMAKE_INSTALL_LIBDIR@"
-#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
-#define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo"
+#define LIBPREFIX "@CMAKE_INSTALL_FULL_LIBDIR@/hardinfo"
+#define PREFIX "@CMAKE_INSTALL_DATAROOTDIR@/hardinfo"
#cmakedefine LIBSOUP_FOUND
#cmakedefine HARDINFO_DEBUG @HARDINFO_DEBUG@