X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b6b148ed5045ce6ee3238287a6f8e78e1cc00163;hp=04ae77519448852399e8838492ef6211d0abde7d;hb=5231084b479455e6cc892ec3c37c9f599c5bea58;hpb=7df46b2af58d171665fe99073188f91d567f2696

diff --git a/Makefile.am b/Makefile.am
index 04ae77519..b6b148ed5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -495,7 +495,13 @@ MANPAGES = \
 	man/systemd-suspend.service.8 \
 	man/systemd-halt.service.8 \
 	man/systemd-fsck@.service.8 \
-	man/systemd-ask-password-console.service.8
+	man/systemd-ask-password-console.service.8 \
+	man/systemd-analyze.1 \
+	man/systemd-tty-ask-password-agent.1 \
+	man/systemd-getty-generator.8 \
+	man/systemd-system-update-generator.8 \
+	man/systemd-fstab-generator.8 \
+	man/systemd.preset.5
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -521,7 +527,10 @@ MANPAGES_ALIAS = \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.service.8 \
-	man/systemd-ask-password-wall.path.8
+	man/systemd-ask-password-wall.path.8 \
+	man/systemd-tmpfiles-setup.service.8 \
+	man/systemd-tmpfiles-clean.service.8 \
+	man/systemd-tmpfiles-clean.timer.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -547,6 +556,9 @@ man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-ask-password-console.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-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -2606,6 +2618,17 @@ cryptsetup-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
 	cryptsetup-install-data-hook
+
+MANPAGES += \
+	man/systemd-cryptsetup@.service.8 \
+	man/systemd-cryptsetup-generator.8 \
+	man/crypttab.5
+
+MANPAGES_ALIAS += \
+	man/systemd-cryptsetup.8
+
+man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -3366,9 +3389,6 @@ if TARGET_FEDORA
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_MANDRIVA
@@ -3377,9 +3397,6 @@ if TARGET_MANDRIVA
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3399,9 +3416,6 @@ if TARGET_MAGEIA
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)