diff options
author | userwithuid <userwithuid@gmail.com> | 2017-04-28 12:22:17 +0000 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-28 08:22:17 -0400 |
commit | 232bd6779727b950553a879f86f1b74108eeb4b4 (patch) | |
tree | 281c153f723bebec5213a7caf9b337e8f5d764d8 /man | |
parent | f5e97db00bf95e12138cdb691e25b40826e83fa6 (diff) | |
download | systemd-232bd6779727b950553a879f86f1b74108eeb4b4.tar.gz |
build-sys: do not install manpages from disabled features (#5844)
A few of the manpages where missing the "conditional" attribute.
Diffstat (limited to 'man')
-rw-r--r-- | man/environment.d.xml | 3 | ||||
-rw-r--r-- | man/rules/meson.build | 15 | ||||
-rw-r--r-- | man/systemd-environment-d-generator.xml | 2 | ||||
-rw-r--r-- | man/systemd-hibernate-resume-generator.xml | 2 | ||||
-rw-r--r-- | man/systemd-hibernate-resume@.service.xml | 2 | ||||
-rw-r--r-- | man/systemd-resolve.xml | 2 | ||||
-rw-r--r-- | man/systemd.environment-generator.xml | 3 |
7 files changed, 17 insertions, 12 deletions
diff --git a/man/environment.d.xml b/man/environment.d.xml index be7758a2f9..78b949160b 100644 --- a/man/environment.d.xml +++ b/man/environment.d.xml @@ -20,7 +20,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="environment.d" xmlns:xi="http://www.w3.org/2001/XInclude"> +<refentry id="environment.d" conditional='ENABLE_ENVIRONMENT_D' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>environment.d</title> diff --git a/man/rules/meson.build b/man/rules/meson.build index 21c996f9b4..1508b012df 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -12,7 +12,7 @@ manpages = [ '5', ['systemd.negative', 'systemd.positive'], 'ENABLE_RESOLVED'], - ['environment.d', '5', [], ''], + ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'], ['file-hierarchy', '7', [], ''], ['halt', '8', ['poweroff', 'reboot'], ''], ['hostname', '5', [], ''], @@ -521,7 +521,7 @@ manpages = [ ['systemd-environment-d-generator', '8', ['30-systemd-environment-d-generator'], - ''], + 'ENABLE_ENVIRONMENT_D'], ['systemd-escape', '1', [], ''], ['systemd-firstboot', '1', ['systemd-firstboot.service'], 'ENABLE_FIRSTBOOT'], ['systemd-fsck@.service', @@ -538,8 +538,11 @@ manpages = [ 'systemd-reboot.service', 'systemd-shutdown'], ''], - ['systemd-hibernate-resume-generator', '8', [], ''], - ['systemd-hibernate-resume@.service', '8', ['systemd-hibernate-resume'], ''], + ['systemd-hibernate-resume-generator', '8', [], 'ENABLE_HIBERNATE'], + ['systemd-hibernate-resume@.service', + '8', + ['systemd-hibernate-resume'], + 'ENABLE_HIBERNATE'], ['systemd-hostnamed.service', '8', ['systemd-hostnamed'], 'ENABLE_HOSTNAMED'], ['systemd-hwdb', '8', [], 'ENABLE_HWDB'], ['systemd-importd.service', '8', ['systemd-importd'], 'ENABLE_IMPORTD'], @@ -585,7 +588,7 @@ manpages = [ ['systemd-random-seed'], 'ENABLE_RANDOMSEED'], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], - ['systemd-resolve', '1', [], ''], + ['systemd-resolve', '1', [], 'ENABLE_RESOLVED'], ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVED'], ['systemd-rfkill.service', '8', @@ -644,7 +647,7 @@ manpages = [ ['systemd', '1', ['init'], ''], ['systemd.automount', '5', [], ''], ['systemd.device', '5', [], ''], - ['systemd.environment-generator', '7', [], ''], + ['systemd.environment-generator', '7', [], 'ENABLE_ENVIRONMENT_D'], ['systemd.exec', '5', [], ''], ['systemd.generator', '7', [], ''], ['systemd.journal-fields', '7', [], ''], diff --git a/man/systemd-environment-d-generator.xml b/man/systemd-environment-d-generator.xml index cc00a5256d..7950aa98a5 100644 --- a/man/systemd-environment-d-generator.xml +++ b/man/systemd-environment-d-generator.xml @@ -23,7 +23,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-environment-d-generator"> +<refentry id="systemd-environment-d-generator" conditional='ENABLE_ENVIRONMENT_D'> <refentryinfo> <title>systemd-environment-d-generator</title> diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml index d811b9b551..3bbb6ab989 100644 --- a/man/systemd-hibernate-resume-generator.xml +++ b/man/systemd-hibernate-resume-generator.xml @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-hibernate-resume-generator"> +<refentry id="systemd-hibernate-resume-generator" conditional='ENABLE_HIBERNATE'> <refentryinfo> <title>systemd-hibernate-resume-generator</title> diff --git a/man/systemd-hibernate-resume@.service.xml b/man/systemd-hibernate-resume@.service.xml index 7d00827447..a968adf0a9 100644 --- a/man/systemd-hibernate-resume@.service.xml +++ b/man/systemd-hibernate-resume@.service.xml @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-hibernate-resume@.service"> +<refentry id="systemd-hibernate-resume@.service" conditional='ENABLE_HIBERNATE'> <refentryinfo> <title>systemd-hibernate-resume@.service</title> diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml index 50da971b07..e3ef26bb81 100644 --- a/man/systemd-resolve.xml +++ b/man/systemd-resolve.xml @@ -21,7 +21,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-resolve" +<refentry id="systemd-resolve" conditional='ENABLE_RESOLVED' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml index fedbd60175..ff8be92833 100644 --- a/man/systemd.environment-generator.xml +++ b/man/systemd.environment-generator.xml @@ -24,7 +24,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd.environment-generator" xmlns:xi="http://www.w3.org/2001/XInclude"> +<refentry id="systemd.environment-generator" conditional='ENABLE_ENVIRONMENT_D' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>systemd.environment-generator</title> <productname>systemd</productname> |