From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 5 Mar 2019 16:43:50 +0000 (+0100)
Subject: meson: modules/experimental_dot_auth - fix basexx installation
X-Git-Tag: v4.0.0~24^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d8c424e1d68974da891986da628e3adabb41ff;p=thirdparty%2Fknot-resolver.git

meson: modules/experimental_dot_auth - fix basexx installation
---

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index f583efbb9..6ecd7a28a 100644
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -4,7 +4,6 @@ usr/lib/tmpfiles.d/knot-resolver.conf
 usr/lib/knot-resolver/*.so
 usr/lib/knot-resolver/*.lua
 usr/lib/knot-resolver/kres_modules/*.so
-usr/lib/knot-resolver/kres_modules/basexx.lua
 usr/lib/knot-resolver/kres_modules/daf.lua
 usr/lib/knot-resolver/kres_modules/daf/*
 usr/lib/knot-resolver/kres_modules/detect_time_jump.lua
diff --git a/modules/experimental_dot_auth/meson.build b/modules/experimental_dot_auth/meson.build
new file mode 100644
index 000000000..b77d745e0
--- /dev/null
+++ b/modules/experimental_dot_auth/meson.build
@@ -0,0 +1,18 @@
+# LUA module: experimental_dot_auth
+
+lua_mod_src += [
+  files('experimental_dot_auth.lua'),
+]
+
+# install bundled basexx dependency
+install_data(
+  files('basexx.lua'),
+  install_dir: lib_dir,
+)
+
+# install static files
+install_subdir(
+  'static',
+  strip_directory: true,
+  install_dir: join_paths(modules_dir, 'http'),
+)
diff --git a/modules/meson.build b/modules/meson.build
index 576830757..0c3d7fb0d 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -5,8 +5,6 @@ lua_mod_src = [  # add lua modules without separate meson.build
   files('detect_time_skew/detect_time_skew.lua'),
   files('dns64/dns64.lua'),
   files('etcd/etcd.lua'),
-  files('experimental_dot_auth/experimental_dot_auth.lua'),
-  files('experimental_dot_auth/basexx.lua'),
   files('graphite/graphite.lua'),
   files('predict/predict.lua'),
   files('prefill/prefill.lua'),
@@ -39,6 +37,7 @@ subdir('bogus_log')
 subdir('daf')
 subdir('dnstap')
 subdir('edns_keepalive')
+subdir('experimental_dot_auth')
 subdir('hints')
 subdir('http')
 subdir('nsid')