1 files changed, 14 insertions, 6 deletions

diff --git a/Makefile-man.am b/Makefile-man.am
index 76c9389835..74a1f4cb43 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -23,7 +23,6 @@ MANPAGES += \
 	man/localtime.5 \
 	man/machine-id.5 \
 	man/machine-info.5 \
-	man/networkctl.1 \
 	man/os-release.5 \
 	man/sd-daemon.3 \
 	man/sd-id128.3 \
@@ -83,7 +82,7 @@ MANPAGES += \
 	man/systemd-ask-password-console.service.8 \
 	man/systemd-ask-password.1 \
 	man/systemd-bus-proxyd.8 \
-	man/systemd-bus-proxyd@.service.8 \
+	man/systemd-bus-proxyd.service.8 \
 	man/systemd-cat.1 \
 	man/systemd-cgls.1 \
 	man/systemd-cgtop.1 \
@@ -144,7 +143,6 @@ MANPAGES += \
 	man/systemd.time.7 \
 	man/systemd.timer.5 \
 	man/systemd.unit.5 \
-	man/sysusers.d.5 \
 	man/telinit.8 \
 	man/tmpfiles.d.5 \
 	man/udev.7 \
@@ -572,7 +570,7 @@ man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 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-bus-proxyd.socket.8: man/systemd-bus-proxyd@.service.8
+man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd.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
@@ -1145,7 +1143,7 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
 man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd@.service.html
+man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd.service.html
 	$(html-alias)
 
 man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
@@ -1538,6 +1536,7 @@ endif
 
 if ENABLE_NETWORKD
 MANPAGES += \
+	man/networkctl.1 \
 	man/systemd-networkd-wait-online.service.8 \
 	man/systemd-networkd.service.8 \
 	man/systemd.netdev.5 \
@@ -1605,6 +1604,15 @@ man/systemd-rfkill.html: man/systemd-rfkill@.service.html
 
 endif
 
+if ENABLE_SYSUSERS
+MANPAGES += \
+	man/sysusers.d.5
+MANPAGES_ALIAS += \
+	#
+
+
+endif
+
 if ENABLE_TIMEDATED
 MANPAGES += \
 	man/systemd-timedated.service.8 \
@@ -2076,8 +2084,8 @@ EXTRA_DIST += \
 	man/systemd-backlight@.service.xml \
 	man/systemd-binfmt.service.xml \
 	man/systemd-bootchart.xml \
+	man/systemd-bus-proxyd.service.xml \
 	man/systemd-bus-proxyd.xml \
-	man/systemd-bus-proxyd@.service.xml \
 	man/systemd-cat.xml \
 	man/systemd-cgls.xml \
 	man/systemd-cgtop.xml \