SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7233 from yuwata/meson-fixes

Browse Source 
Meson fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-11-01 10:14:01 +01:00
committed by GitHub
parent 2e293b4a14 3bd469546b
commit 7e21459f6d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/meson.build
+3 -3
View File
@@ -32,7 +32,7 @@ custom_entities_ent = configure_file(
man_pages = []
html_pages = []
source_xml_files = []
foreach tuple : manpages
foreach tuple : want_man or want_html ? manpages : []
stem = tuple[0]
section = tuple[1]
aliases = tuple[2]
@@ -115,8 +115,8 @@ systemd_index_xml = custom_target(
output : 'systemd.index.xml',
command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
['systemd.index', '7', systemd_index_xml]]
foreach tuple : want_man or want_html ? [['systemd.directives', '7', systemd_directives_xml],
['systemd.index', '7', systemd_index_xml]] : []
stem = tuple[0]
section = tuple[1]
xml = tuple[2]
units/meson.build
+1 -1
View File
@@ -208,7 +208,7 @@ in_units = [
'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'],
['systemd-update-utmp.service', 'ENABLE_UTMP',
'sysinit.target.wants/'],
['systemd-user-sessions.service', '',
['systemd-user-sessions.service', 'HAVE_PAM',
'multi-user.target.wants/'],
['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
['systemd-volatile-root.service', ''],