meson: add option to override modules dir

diff --git a/doc/build.rst b/doc/build.rst
index 99f2c92501f2064bbbaa6bd5081732c245ccca02..4cf427457f663f957285372c248f942df56cfb18 100644 (file)
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -168,6 +168,8 @@ Building for packages
 
 The build system supports DESTDIR_
 
+TODO no longer support, use meson --prefix instead (DESTDIR will cause invalid path to modules)
+
 .. Our amalgamation has fallen into an unmaintained state and probably doesn't work.
 .. and `amalgamated builds <https://www.sqlite.org/amalgamation.html>`_.
 

diff --git a/meson.build b/meson.build
index 58971d1a7ad7171a961d2d8d2945608b104e0246..8f3a44fac62f1faf52c133986a30eac804055b82 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -6,8 +6,13 @@ project(
 )
 
 libkres_soversion = 9
-# TODO change modules_dir to sensible lua(jit) default
-modules_dir = join_paths(get_option('libdir'), 'kdns_modules')
+if get_option('modules_dir') == ''
+  modules_dir = join_paths(
+    get_option('prefix'), get_option('libdir'), 'knot-resolver')
+else
+  modules_dir = get_option('modules_dir')
+endif
+message('modules_dir: ' + modules_dir)
 
 
 # Project-wide dependencies

diff --git a/meson_options.txt b/meson_options.txt
index 750fdeac2f50abdac47194b8a48bd90053ce32fa..2580a5d74e13801b629f71f2776268926333b8a2 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
 option('cookies', type: 'boolean', value: false, description: 'Support for DNS Cookies.')
 option('client', type : 'boolean', value : true, description: 'kresc client binary')
 option('daemon', type: 'boolean', value: true, description: 'kresd daemon binary')
+option('modules_dir', type: 'string', description: 'path to kres modules directory')