Skip to content

Commit 1c9f131

Browse files
userwithuidkeszybz
authored andcommitted
meson: do not install files from disabled features (systemd#5811)
Mirror conditions from Makefile.am.
1 parent 5d96ab7 commit 1c9f131

File tree

6 files changed

+30
-22
lines changed

6 files changed

+30
-22
lines changed

docs/sysvinit/meson.build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ file = configure_file(
22
input : 'README.in',
33
output : 'README',
44
configuration : substs)
5-
install_data(file,
6-
install_dir : sysvinit_path)
5+
6+
if conf.get('HAVE_SYSV_COMPAT', 0) == 1
7+
install_data(file,
8+
install_dir : sysvinit_path)
9+
endif

docs/var-log/meson.build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ file = configure_file(
22
input : 'README.in',
33
output : 'README',
44
configuration : substs)
5-
install_data(file,
6-
install_dir : varlogdir)
5+
6+
if conf.get('HAVE_SYSV_COMPAT', 0) == 1
7+
install_data(file,
8+
install_dir : varlogdir)
9+
endif

src/hostname/meson.build

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
install_data('org.freedesktop.hostname1.conf',
2-
install_dir : dbuspolicydir)
3-
install_data('org.freedesktop.hostname1.service',
4-
install_dir : dbussystemservicedir)
5-
61
if conf.get('ENABLE_HOSTNAMED', 0) == 1
2+
install_data('org.freedesktop.hostname1.conf',
3+
install_dir : dbuspolicydir)
4+
install_data('org.freedesktop.hostname1.service',
5+
install_dir : dbussystemservicedir)
6+
77
custom_target(
88
'org.freedesktop.hostname1.policy',
99
input : 'org.freedesktop.hostname1.policy.in',

src/journal-remote/meson.build

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1
3737
configuration : substs)
3838
install_data(journal_remote_conf,
3939
install_dir : pkgsysconfdir)
40-
endif
4140

42-
install_data('browse.html',
43-
install_dir : join_paths(pkgdatadir, 'gatewayd'))
41+
install_data('browse.html',
42+
install_dir : join_paths(pkgdatadir, 'gatewayd'))
4443

45-
meson.add_install_script('sh', '-c',
46-
mkdir_p.format('/var/log/journal/remote'))
47-
meson.add_install_script('sh', '-c',
48-
'chown 0:0 $DESTDIR/var/log/journal/remote &&
49-
chmod 755 $DESTDIR/var/log/journal/remote || :')
44+
meson.add_install_script('sh', '-c',
45+
mkdir_p.format('/var/log/journal/remote'))
46+
meson.add_install_script('sh', '-c',
47+
'chown 0:0 $DESTDIR/var/log/journal/remote &&
48+
chmod 755 $DESTDIR/var/log/journal/remote || :')
49+
endif

src/locale/meson.build

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ endif
2727
kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map')
2828
language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map')
2929

30-
install_data('kbd-model-map',
31-
'language-fallback-map',
32-
install_dir : pkgdatadir)
30+
if conf.get('ENABLE_LOCALED', 0) == 1
31+
install_data('kbd-model-map',
32+
'language-fallback-map',
33+
install_dir : pkgdatadir)
34+
endif
3335

3436
tests += [
3537
[['src/locale/test-keymap-util.c',

units/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ units = [
8080
'sockets.target.wants/'],
8181
['systemd-initctl.socket', '',
8282
'sockets.target.wants/'],
83-
['systemd-journal-gatewayd.socket', ''],
84-
['systemd-journal-remote.socket', ''],
83+
['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
84+
['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
8585
['systemd-journald-audit.socket', '',
8686
'sockets.target.wants/'],
8787
['systemd-journald-dev-log.socket', '',

0 commit comments

Comments
 (0)