colin/libmegapixels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing build steps/includes to allow changing SYSCONFDIR/DATADIR

Browse Source
This commit is contained in:
Kristian Vos
2024-04-26 14:18:41 +02:00
parent 82a7a2ed8f
commit 9efc806478
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -26,4 +26,7 @@ target_link_libraries(getframe PUBLIC megapixels)
add_executable(sensorprofile util/sensorprofile.c) add_executable(sensorprofile util/sensorprofile.c)
target_include_directories(sensorprofile PUBLIC include) target_include_directories(sensorprofile PUBLIC include)
target_link_libraries(sensorprofile PUBLIC megapixels) target_link_libraries(sensorprofile PUBLIC megapixels)
add_compile_definitions(SYSCONFDIR="/etc")
add_compile_definitions(DATADIR="/usr/share")

7
meson.build
View File

@@ -47,6 +47,13 @@ pkg_mod.generate(libraries: libmegapixels,
filebase: 'libmegapixels', filebase: 'libmegapixels',
description: 'The camera control bits from Megapixels') 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', executable('megapixels-findconfig', 'util/findconfig.c',
link_with: libmegapixels, link_with: libmegapixels,
include_directories: inc, include_directories: inc,

1
src/findconfig.c
View File

@@ -1,6 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <libmegapixels.h> #include <libmegapixels.h>
#include "config.h"
#ifndef SYSCONFDIR #ifndef SYSCONFDIR
#define SYSCONFDIR "/etc" #define SYSCONFDIR "/etc"