Skip to content

Commit 1d295ff

Browse files
committed
Drop duplication from meson.build
1 parent dd639ff commit 1d295ff

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

meson.build

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ project('systemd-netlogd', 'c',
1313
conf = configuration_data()
1414
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
1515
conf.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
16-
17-
substs = configuration_data()
18-
substs.set('PACKAGE_URL', 'https://github.com/systemd/systemd-netlogd')
19-
substs.set('PACKAGE_VERSION', meson.project_version())
20-
substs.set('PKGPREFIX', get_option('prefix'))
16+
conf.set('PACKAGE_URL', 'https://github.com/systemd/systemd-netlogd')
17+
conf.set('PKGPREFIX', get_option('prefix'))
2118
conf.set_quoted('PKGSYSCONFDIR', get_option('sysconfdir'))
2219

2320
#####################################################################
@@ -159,7 +156,7 @@ endif
159156
systemd_netlogd_conf = configure_file(
160157
input : 'conf/netlogd.conf.in',
161158
output : 'netlogd.conf',
162-
configuration : substs)
159+
configuration : conf)
163160
install_data(systemd_netlogd_conf,
164161
install_dir : get_option('sysconfdir'))
165162

units/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
systemd_netlogd_conf = configure_file(
22
input : 'systemd-netlogd.service.in',
33
output : 'systemd-netlogd.service',
4-
configuration : substs)
4+
configuration : conf)
55
install_data(systemd_netlogd_conf,
66
install_dir : get_option('prefix') / 'system')

0 commit comments

Comments
 (0)