Skip to content

Commit e306b25

Browse files
committed
meson: create two disctincts confs for the .in files
1 parent 4ec26c6 commit e306b25

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/meson.build

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
2-
moduledir = join_paths(pkgdatadir, meson.project_name())
2+
moduledir = join_paths(pkgdatadir, 'diffuse')
33
sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
44

55
python = import('python')
66

77
conf = configuration_data()
88
conf.set('PYTHON', python.find_installation('python3').path())
9-
conf.set('VERSION', meson.project_version())
10-
conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
119
conf.set('pkgdatadir', pkgdatadir)
12-
conf.set('sysconfigdir', sysconfdir)
13-
conf.set('log_print_output', get_option('log_print_output'))
14-
conf.set('log_print_stack', get_option('log_print_stack'))
15-
conf.set('use_flatpak', get_option('use_flatpak'))
10+
conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
1611

1712
configure_file(
1813
input: 'diffuse.in',
@@ -22,6 +17,13 @@ configure_file(
2217
install_dir: get_option('bindir')
2318
)
2419

20+
conf = configuration_data()
21+
conf.set('VERSION', meson.project_version())
22+
conf.set('sysconfigdir', sysconfdir)
23+
conf.set('log_print_output', get_option('log_print_output'))
24+
conf.set('log_print_stack', get_option('log_print_stack'))
25+
conf.set('use_flatpak', get_option('use_flatpak'))
26+
2527
configure_file(
2628
input: 'constants.py.in',
2729
output: 'constants.py',

0 commit comments

Comments
 (0)