build-sys: do not install manpages from disabled features (#5844)

A few of the manpages where missing the "conditional" attribute.

1 files changed, 26 insertions, 16 deletions

diff --git a/Makefile-man.am b/Makefile-man.am
index f436361074..8f48f38209 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -11,7 +11,6 @@ MANPAGES += \
 	man/bootup.7 \
 	man/busctl.1 \
 	man/daemon.7 \
-	man/environment.d.5 \
 	man/file-hierarchy.7 \
 	man/halt.8 \
 	man/hostname.5 \
@@ -111,15 +110,12 @@ MANPAGES += \
 	man/systemd-debug-generator.8 \
 	man/systemd-delta.1 \
 	man/systemd-detect-virt.1 \
-	man/systemd-environment-d-generator.8 \
 	man/systemd-escape.1 \
 	man/systemd-fsck@.service.8 \
 	man/systemd-fstab-generator.8 \
 	man/systemd-getty-generator.8 \
 	man/systemd-gpt-auto-generator.8 \
 	man/systemd-halt.service.8 \
-	man/systemd-hibernate-resume-generator.8 \
-	man/systemd-hibernate-resume@.service.8 \
 	man/systemd-inhibit.1 \
 	man/systemd-initctl.service.8 \
 	man/systemd-journald.service.8 \
@@ -130,7 +126,6 @@ MANPAGES += \
 	man/systemd-nspawn.1 \
 	man/systemd-path.1 \
 	man/systemd-remount-fs.service.8 \
-	man/systemd-resolve.1 \
 	man/systemd-run.1 \
 	man/systemd-sleep.conf.5 \
 	man/systemd-socket-activate.1 \
@@ -148,7 +143,6 @@ MANPAGES += \
 	man/systemd.1 \
 	man/systemd.automount.5 \
 	man/systemd.device.5 \
-	man/systemd.environment-generator.7 \
 	man/systemd.exec.5 \
 	man/systemd.generator.7 \
 	man/systemd.journal-fields.7 \
@@ -187,7 +181,6 @@ MANPAGES += \
 	man/udev_new.3 \
 	man/udevadm.8
 MANPAGES_ALIAS += \
-	man/30-systemd-environment-d-generator.8 \
 	man/SD_ALERT.3 \
 	man/SD_BUS_ERROR_ACCESS_DENIED.3 \
 	man/SD_BUS_ERROR_ADDRESS_IN_USE.3 \
@@ -463,7 +456,6 @@ MANPAGES_ALIAS += \
 	man/systemd-ask-password-wall.service.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-fsck.8 \
-	man/systemd-hibernate-resume.8 \
 	man/systemd-hibernate.service.8 \
 	man/systemd-hybrid-sleep.service.8 \
 	man/systemd-initctl.8 \
@@ -547,7 +539,6 @@ MANPAGES_ALIAS += \
 	man/udev_ref.3 \
 	man/udev_unref.3 \
 	man/user.conf.d.5
-man/30-systemd-environment-d-generator.8: man/systemd-environment-d-generator.8
 man/SD_ALERT.3: man/sd-daemon.3
 man/SD_BUS_ERROR_ACCESS_DENIED.3: man/sd-bus-errors.3
 man/SD_BUS_ERROR_ADDRESS_IN_USE.3: man/sd-bus-errors.3
@@ -823,7 +814,6 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-fsck.8: man/systemd-fsck@.service.8
-man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
 man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
 man/systemd-initctl.8: man/systemd-initctl.service.8
@@ -907,9 +897,6 @@ man/udev_monitor_unref.3: man/udev_monitor_new_from_netlink.3
 man/udev_ref.3: man/udev_new.3
 man/udev_unref.3: man/udev_new.3
 man/user.conf.d.5: man/systemd-system.conf.5
-man/30-systemd-environment-d-generator.html: man/systemd-environment-d-generator.html
-	$(html-alias)
-
 man/SD_ALERT.html: man/sd-daemon.html
 	$(html-alias)
 
@@ -1735,9 +1722,6 @@ man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
 man/systemd-fsck.html: man/systemd-fsck@.service.html
 	$(html-alias)
 
-man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
-	$(html-alias)
-
 man/systemd-hibernate.service.html: man/systemd-suspend.service.html
 	$(html-alias)
 
@@ -2043,6 +2027,19 @@ MANPAGES_ALIAS += \
 
 endif
 
+if ENABLE_ENVIRONMENT_D
+MANPAGES += \
+	man/environment.d.5 \
+	man/systemd-environment-d-generator.8 \
+	man/systemd.environment-generator.7
+MANPAGES_ALIAS += \
+	man/30-systemd-environment-d-generator.8
+man/30-systemd-environment-d-generator.8: man/systemd-environment-d-generator.8
+man/30-systemd-environment-d-generator.html: man/systemd-environment-d-generator.html
+	$(html-alias)
+
+endif
+
 if ENABLE_FIRSTBOOT
 MANPAGES += \
 	man/systemd-firstboot.1
@@ -2054,6 +2051,18 @@ man/systemd-firstboot.service.html: man/systemd-firstboot.html
 
 endif
 
+if ENABLE_HIBERNATE
+MANPAGES += \
+	man/systemd-hibernate-resume-generator.8 \
+	man/systemd-hibernate-resume@.service.8
+MANPAGES_ALIAS += \
+	man/systemd-hibernate-resume.8
+man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
+man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
+	$(html-alias)
+
+endif
+
 if ENABLE_HOSTNAMED
 MANPAGES += \
 	man/hostnamectl.1 \
@@ -2188,6 +2197,7 @@ MANPAGES += \
 	man/dnssec-trust-anchors.d.5 \
 	man/nss-resolve.8 \
 	man/resolved.conf.5 \
+	man/systemd-resolve.1 \
 	man/systemd-resolved.service.8
 MANPAGES_ALIAS += \
 	man/libnss_resolve.so.2.8 \