Meson: copy configuration data so we don't have to duplicate it manually

Fixes #138 and 5d81027e84.
This commit is contained in:
Jente Hidskes
2017-08-21 12:26:29 +02:00
committed by Peter Hutterer
parent 6962abf3b6
commit 92ca0d894b

View File

@@ -36,21 +36,19 @@ config_piper.set('gtk_major_version', gtk_major_version)
config_piper.set('gtk_minor_version', gtk_minor_version)
config_piper.set('devel', '')
configure_file(input: 'piper.in',
output: 'piper',
configuration: config_piper,
install_dir: bindir)
config_piper_devel = configuration_data()
config_piper_devel = config_piper
config_piper_devel.set('pkgdatadir', join_paths(meson.build_root(), 'data'))
config_piper_devel.set('localedir', join_paths(meson.build_root(), 'po'))
config_piper_devel.set('gtk_major_version', gtk_major_version)
config_piper_devel.set('gtk_minor_version', gtk_minor_version)
config_piper_devel.set('devel', '
sys.path.insert(1, \'@0@\')
print(\'Running from source tree, using local files\')
'.format(meson.source_root()))
configure_file(input: 'piper.in',
output: 'piper',
configuration: config_piper,
install_dir: bindir)
configure_file(input: 'piper.in',
output: 'piper.devel',
configuration: config_piper_devel)