diff options
author | Linus Svensson <linussn@axis.com> | 2016-10-21 19:01:02 +0200 |
---|---|---|
committer | Wim Taymans <wtaymans@redhat.com> | 2017-05-16 09:13:36 +0200 |
commit | 740125a12e7a6fb5da36b2bfeb591c3fdf8a5e17 (patch) | |
tree | 11ea614b11ddfd97d502fbf56ac8c88d8313365b /meson.build | |
parent | 04ffc679fced64ed99943abb2468a0e88c586c1c (diff) |
meson.build: Install conf file under ${sysconfdir}
Base conf file path on sysconfdir. sysconfdir can be specified with an
absolute or relative path. To ensure PINOS_CONFIG_DIR is set correctly,
use join_paths() to prepend prefix when sysconfdir is relative.
Meson added support for sysconfdir in version 0.34.0 and join_paths() in
version 0.36.0.
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 5aee6a75..a2e986cd 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('pinos', 'c', version : '0.0.1.1', - meson_version : '>= 0.33.0', + meson_version : '>= 0.36.0', default_options : [ 'warning_level=1', 'c_std=gnu99', 'buildtype=debugoptimized' ]) @@ -50,7 +50,7 @@ cdata.set('PACKAGE_TARNAME', '"pinos"') cdata.set('PACKAGE_URL', '""') cdata.set('PACKAGE_VERSION', '"@0@"'.format(pinos_version)) cdata.set('MODULEDIR', '"@0@/@1@/pinos-@2@"'.format(get_option('prefix'),get_option('libdir'),apiversion)) -cdata.set('PINOS_CONFIG_DIR', '"@0@/etc/pinos"'.format(get_option('prefix'))) +cdata.set('PINOS_CONFIG_DIR', '"@0@/pinos"'.format(join_paths(get_option('prefix'), get_option('sysconfdir')))) cdata.set('VERSION', '"@0@"'.format(pinos_version)) # FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option cdata.set('MEMORY_ALIGNMENT_MALLOC', 1) |