shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-04-01 18:50:16 +03:00
Code

meson: do not install files from disabled features (#5811)

Browse Source 
Mirror conditions from Makefile.am.
This commit is contained in:
userwithuid 2017-04-27 17:47:04 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent 5d96ab7d6d
commit 1c9f131444
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/sysvinit/meson.build
View File

@ -2,5 +2,8 @@ file = configure_file(
input : 'README.in',
output : 'README',
configuration : substs)
install_data(file,
install_dir : sysvinit_path)
if conf.get('HAVE_SYSV_COMPAT', 0) == 1
install_data(file,
install_dir : sysvinit_path)
endif

7
docs/var-log/meson.build
View File

@ -2,5 +2,8 @@ file = configure_file(
input : 'README.in',
output : 'README',
configuration : substs)
install_data(file,
install_dir : varlogdir)
if conf.get('HAVE_SYSV_COMPAT', 0) == 1
install_data(file,
install_dir : varlogdir)
endif

10
src/hostname/meson.build
View File

@ -1,9 +1,9 @@
install_data('org.freedesktop.hostname1.conf',
install_dir : dbuspolicydir)
install_data('org.freedesktop.hostname1.service',
install_dir : dbussystemservicedir)
if conf.get('ENABLE_HOSTNAMED', 0) == 1
install_data('org.freedesktop.hostname1.conf',
install_dir : dbuspolicydir)
install_data('org.freedesktop.hostname1.service',
install_dir : dbussystemservicedir)
custom_target(
'org.freedesktop.hostname1.policy',
input : 'org.freedesktop.hostname1.policy.in',

18
src/journal-remote/meson.build
View File

@ -37,13 +37,13 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1
configuration : substs)
install_data(journal_remote_conf,
install_dir : pkgsysconfdir)
install_data('browse.html',
install_dir : join_paths(pkgdatadir, 'gatewayd'))
meson.add_install_script('sh', '-c',
mkdir_p.format('/var/log/journal/remote'))
meson.add_install_script('sh', '-c',
'chown 0:0 $DESTDIR/var/log/journal/remote &&
chmod 755 $DESTDIR/var/log/journal/remote || :')
endif
install_data('browse.html',
install_dir : join_paths(pkgdatadir, 'gatewayd'))
meson.add_install_script('sh', '-c',
mkdir_p.format('/var/log/journal/remote'))
meson.add_install_script('sh', '-c',
'chown 0:0 $DESTDIR/var/log/journal/remote &&
chmod 755 $DESTDIR/var/log/journal/remote || :')

8
src/locale/meson.build
View File

@ -27,9 +27,11 @@ endif
kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map')
language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map')
install_data('kbd-model-map',
'language-fallback-map',
install_dir : pkgdatadir)
if conf.get('ENABLE_LOCALED', 0) == 1
install_data('kbd-model-map',
'language-fallback-map',
install_dir : pkgdatadir)
endif
tests += [
[['src/locale/test-keymap-util.c',

4
units/meson.build
View File

@ -80,8 +80,8 @@ units = [
'sockets.target.wants/'],
['systemd-initctl.socket', '',
'sockets.target.wants/'],
['systemd-journal-gatewayd.socket', ''],
['systemd-journal-remote.socket', ''],
['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
['systemd-journald-audit.socket', '',
'sockets.target.wants/'],
['systemd-journald-dev-log.socket', '',