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.
This commit is contained in:
Linus Svensson 2016-10-21 19:01:02 +02:00 committed by Wim Taymans
parent 04ffc679fc
commit 740125a12e
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
project('pinos', 'c', project('pinos', 'c',
version : '0.0.1.1', version : '0.0.1.1',
meson_version : '>= 0.33.0', meson_version : '>= 0.36.0',
default_options : [ 'warning_level=1', default_options : [ 'warning_level=1',
'c_std=gnu99', 'c_std=gnu99',
'buildtype=debugoptimized' ]) 'buildtype=debugoptimized' ])
@ -50,7 +50,7 @@ cdata.set('PACKAGE_TARNAME', '"pinos"')
cdata.set('PACKAGE_URL', '""') cdata.set('PACKAGE_URL', '""')
cdata.set('PACKAGE_VERSION', '"@0@"'.format(pinos_version)) 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('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)) cdata.set('VERSION', '"@0@"'.format(pinos_version))
# FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option # FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option
cdata.set('MEMORY_ALIGNMENT_MALLOC', 1) cdata.set('MEMORY_ALIGNMENT_MALLOC', 1)

View file

@ -14,7 +14,7 @@ pinos_c_args = [
] ]
conf_config = configuration_data() conf_config = configuration_data()
conf_install_dir = '@0@/etc/pinos'.format(get_option('prefix')) conf_install_dir = '@0@/pinos'.format(get_option('sysconfdir'))
configure_file(input : 'pinos.conf.in', configure_file(input : 'pinos.conf.in',
output : 'pinos.conf', output : 'pinos.conf',