X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=370ee2e648b713f4550b7e50eb2d240a7c8b9613;hp=751511bc468ec8ae35cecb21efff8c20ee69b807;hb=91ac74250149a29122b2291c5393dec4592430d4;hpb=11901ad59689002aa7bbf598e76617f1cfeebd34 diff --git a/Makefile.am b/Makefile.am index 751511bc4..370ee2e64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = dist_pkgsysconf_DATA = +dist_pkgdata_DATA = dist_dbuspolicy_DATA = dbusinterface_DATA = dist_dbussystemservice_DATA = @@ -132,6 +133,7 @@ AM_CPPFLAGS = \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ + -DSYSTEMD_NTP_UNITS=\"$(pkgdatadir)/ntp-units\" \ -DX_SERVER=\"$(bindir)/X\" \ -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ @@ -309,7 +311,6 @@ dist_systemunit_DATA = \ units/syslog.target \ units/systemd-udev-control.socket \ units/systemd-udev-kernel.socket \ - units/systemd-timedated-ntp.target \ units/system-update.target nodist_systemunit_DATA = \ @@ -342,7 +343,7 @@ nodist_systemunit_DATA = \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service + units/debug-shell.service dist_userunit_DATA = \ units/user/default.target \ @@ -380,7 +381,7 @@ EXTRA_DIST += \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service.in \ + units/debug-shell.service.in \ units/systemd-hibernate.service.in \ units/systemd-suspend.service.in \ introspect.awk \ @@ -491,7 +492,17 @@ MANPAGES = \ man/systemd-remount-fs.service.8 \ man/systemd-update-utmp-runlevel.service.8 \ man/systemd-initctl.service.8 \ - man/systemd-shutdownd.service.8 + man/systemd-shutdownd.service.8 \ + man/systemd-suspend.service.8 \ + man/systemd-halt.service.8 \ + man/systemd-fsck@.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 \ @@ -499,24 +510,56 @@ MANPAGES_ALIAS = \ man/init.1 \ man/systemd-modules-load.8 \ man/systemd-sysctl.8 \ + man/systemd-journald.socket.8 \ man/systemd-journald.8 \ man/systemd-remount-fs.8 \ man/systemd-update-utmp-shutdown.service.8 \ man/systemd-update-utmp.8 \ + man/systemd-initctl.socket.8 \ man/systemd-initctl.8 \ - man/systemd-shutdownd.8 + man/systemd-shutdownd.socket.8 \ + man/systemd-shutdownd.8 \ + man/systemd-hibernate.service.8 \ + man/systemd-sleep.8 \ + man/systemd-shutdown.8 \ + man/systemd-poweroff.service.8 \ + man/systemd-reboot.service.8 \ + man/systemd-kexec.service.8 \ + 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-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 man/init.1: man/systemd.1 man/systemd-modules-load.8: man/systemd-modules-load.service.8 man/systemd-sysctl.8: man/systemd-sysctl.service.8 +man/systemd-journald.socket.8: man/systemd-journald.service.8 man/systemd-journald.8: man/systemd-journald.service.8 man/systemd-remount-fs.8: man/systemd-remount-fs.service.8 man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 +man/systemd-initctl.socket.8: man/systemd-initctl.service.8 man/systemd-initctl.8: man/systemd-initctl.service.8 +man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8 +man/systemd-hibernate.service.8: man/systemd-suspend.service.8 +man/systemd-sleep.8: man/systemd-suspend.service.8 +man/systemd-shutdown.8: man/systemd-halt.service.8 +man/systemd-poweroff.service.8: man/systemd-halt.service.8 +man/systemd-reboot.service.8: man/systemd-halt.service.8 +man/systemd-kexec.service.8: man/systemd-halt.service.8 +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)}}}}} @@ -1449,7 +1492,7 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ - man/systemd-udevd.service.8 + man/systemd-udev.service.8 MANPAGES_ALIAS += \ man/systemd-udevd.8 @@ -2447,7 +2490,20 @@ EXTRA_DIST += \ MANPAGES += \ man/sd_readahead.3 \ - man/sd-readahead.7 + man/sd-readahead.7 \ + man/systemd-readahead-replay.service.8 + +MANPAGES_ALIAS += \ + man/systemd-readahead-collect.service.8 \ + man/systemd-readahead-done.service.8 \ + man/systemd-readahead-done.timer.8 \ + man/systemd-readahead.8 + +man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead.8: man/systemd-readahead-replay.service.8 + endif # ------------------------------------------------------------------------------ @@ -2466,6 +2522,15 @@ systemd_quotacheck_SOURCES = \ systemd_quotacheck_LDADD = \ libsystemd-shared.la + +MANPAGES += \ + man/systemd-quotacheck.service.8 + +MANPAGES_ALIAS += \ + man/systemd-quotacheck.8 + +man/systemd-quotacheck.8: man/systemd-quotacheck.service.8 + endif # ------------------------------------------------------------------------------ @@ -2554,6 +2619,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 # ------------------------------------------------------------------------------ @@ -2670,7 +2746,7 @@ man/systemd-localed.8: man/systemd-localed.service.8 EXTRA_DIST += \ units/systemd-localed.service.in -dist_pkgdata_DATA = \ +dist_pkgdata_DATA += \ src/locale/kbd-model-map dist_noinst_SCRIPT = \ @@ -2726,6 +2802,9 @@ timedated-install-data-hook: INSTALL_DATA_HOOKS += \ timedated-install-data-hook +dist_pkgdata_DATA += \ + src/timedate/ntp-units + MANPAGES += \ man/systemd-timedated.service.8 @@ -3314,9 +3393,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 @@ -3325,9 +3401,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 @@ -3347,9 +3420,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)