From 3324e27dee9baf3097569124ccd749b3e798daab Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 5 Jun 2024 16:01:47 +0200 Subject: [PATCH] Add the package name to the icons and ui paths CMAKE_INSTALL_FULL_DATADIR gives the read-only architecture-independent data root without the package name, so BuildEnv::package_pkgdata_dir() only returns that ("/usr/share" or equivalent). This adds the package name to the appropriate search paths in app_init_and_loop(). Signed-off-by: Stephen Kitt --- src/gui/gsc_init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/gsc_init.cpp b/src/gui/gsc_init.cpp index ae36922..d2af3d6 100644 --- a/src/gui/gsc_init.cpp +++ b/src/gui/gsc_init.cpp @@ -473,8 +473,8 @@ bool app_init_and_loop(int& argc, char**& argv) hz::data_file_add_search_directory("ui", application_dir / "ui"); hz::data_file_add_search_directory("doc", application_dir / "doc"); } else { - hz::data_file_add_search_directory("icons", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / "icons"); // /usr/share/program_name/icons - hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / "ui"); // /usr/share/program_name/ui + hz::data_file_add_search_directory("icons", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / BuildEnv::package_name() / "icons"); // /usr/share/program_name/icons + hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / BuildEnv::package_name() / "ui"); // /usr/share/program_name/ui hz::data_file_add_search_directory("doc", hz::fs_path_from_string(BuildEnv::package_doc_dir())); // /usr/share/doc/[packages/]gsmartcontrol } }