From 92ca0d894b26c3dc84da63eb16f5f3bc39776a9d Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Mon, 21 Aug 2017 12:26:29 +0200 Subject: [PATCH] Meson: copy configuration data so we don't have to duplicate it manually Fixes #138 and 5d81027e841939c12eefc2a4bd5dcd0cad451942. --- meson.build | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 656a467..de9cf84 100644 --- a/meson.build +++ b/meson.build @@ -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)