Browse Source

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

Kristian Vos 11 months ago
parent
commit
9efc806478
3 changed files with 12 additions and 1 deletions
  1. 4 1
      CMakeLists.txt
  2. 7 0
      meson.build
  3. 1 0
      src/findconfig.c

+ 4 - 1
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)
+target_link_libraries(sensorprofile PUBLIC megapixels)
+
+add_compile_definitions(SYSCONFDIR="/etc")
+add_compile_definitions(DATADIR="/usr/share")

+ 7 - 0
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,

+ 1 - 0
src/findconfig.c

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