From e306b25cb9e0b621b3796a23cca646f6880c6a9d Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sun, 21 Nov 2021 12:53:02 -0500 Subject: [PATCH] meson: create two disctincts confs for the .in files --- src/meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/meson.build b/src/meson.build index eccac61..b731de1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,18 +1,13 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -moduledir = join_paths(pkgdatadir, meson.project_name()) +moduledir = join_paths(pkgdatadir, 'diffuse') sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) python = import('python') conf = configuration_data() conf.set('PYTHON', python.find_installation('python3').path()) -conf.set('VERSION', meson.project_version()) -conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir'))) conf.set('pkgdatadir', pkgdatadir) -conf.set('sysconfigdir', sysconfdir) -conf.set('log_print_output', get_option('log_print_output')) -conf.set('log_print_stack', get_option('log_print_stack')) -conf.set('use_flatpak', get_option('use_flatpak')) +conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir'))) configure_file( input: 'diffuse.in', @@ -22,6 +17,13 @@ configure_file( install_dir: get_option('bindir') ) +conf = configuration_data() +conf.set('VERSION', meson.project_version()) +conf.set('sysconfigdir', sysconfdir) +conf.set('log_print_output', get_option('log_print_output')) +conf.set('log_print_stack', get_option('log_print_stack')) +conf.set('use_flatpak', get_option('use_flatpak')) + configure_file( input: 'constants.py.in', output: 'constants.py',