From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 25 Jan 2019 12:57:28 +0000 (+0100)
Subject: meson: use proper etc_dir location
X-Git-Tag: v4.0.0~24^2~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa69bd99642fcfab8384615f151dc186357ca3df;p=thirdparty%2Fknot-resolver.git

meson: use proper etc_dir location
---

diff --git a/daemon/meson.build b/daemon/meson.build
index 37db785b5..cefd0bfbf 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -31,8 +31,7 @@ luajit_has_setfuncs = run_command(
 # daemon CFLAGS
 c_args = [
   '-fPIE',  # TODO pie=true since 0.49.0
-  '-DROOTHINTS="@0@/root.hints"'.format(
-      join_paths(get_option('prefix'), get_option('sysconfdir'))),
+  '-DROOTHINTS="@0@/root.hints"'.format(etc_dir),
   '-DLIBEXT="@0@"'.format(lib_suffix),
   '-Dlibzscanner_SONAME="@0@"'.format(libzscanner.get_pkgconfig_variable('soname')),
   '-Dlibknot_SONAME="@0@"'.format(libknot.get_pkgconfig_variable('soname')),
diff --git a/meson.build b/meson.build
index 8f3a44fac..6fb958e7a 100644
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ project(
 )
 
 libkres_soversion = 9
+
 if get_option('modules_dir') == ''
   modules_dir = join_paths(
     get_option('prefix'), get_option('libdir'), 'knot-resolver')
@@ -14,6 +15,8 @@ else
 endif
 message('modules_dir: ' + modules_dir)
 
+etc_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'knot-resolver')
+
 
 # Project-wide dependencies
 
@@ -183,4 +186,4 @@ install_data(
 
 # etc
 
-install_data(sources: 'etc/root.hints', install_dir: get_option('sysconfdir'))
+install_data(sources: 'etc/root.hints', install_dir: etc_dir)