From 9efc806478c20bcf87a59c09c370647f9f028ca7 Mon Sep 17 00:00:00 2001 From: Kristian Vos Date: Fri, 26 Apr 2024 14:18:41 +0200 Subject: [PATCH] Add missing build steps/includes to allow changing SYSCONFDIR/DATADIR --- CMakeLists.txt | 5 ++++- meson.build | 7 +++++++ src/findconfig.c | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46a789b..ba104c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,4 +26,7 @@ target_link_libraries(getframe PUBLIC megapixels) add_executable(sensorprofile util/sensorprofile.c) target_include_directories(sensorprofile PUBLIC include) -target_link_libraries(sensorprofile PUBLIC megapixels) \ No newline at end of file +target_link_libraries(sensorprofile PUBLIC megapixels) + +add_compile_definitions(SYSCONFDIR="/etc") +add_compile_definitions(DATADIR="/usr/share") \ No newline at end of file diff --git a/meson.build b/meson.build index 7aac3e1..c53a566 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,13 @@ pkg_mod.generate(libraries: libmegapixels, filebase: 'libmegapixels', description: 'The camera control bits from Megapixels') +conf = configuration_data() +conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) +conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) +configure_file( + output: 'config.h', + configuration: conf) + executable('megapixels-findconfig', 'util/findconfig.c', link_with: libmegapixels, include_directories: inc, diff --git a/src/findconfig.c b/src/findconfig.c index a55b4b8..66a6c3b 100644 --- a/src/findconfig.c +++ b/src/findconfig.c @@ -1,6 +1,7 @@ #include #include #include +#include "config.h" #ifndef SYSCONFDIR #define SYSCONFDIR "/etc"