X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=64d4785db3ca889e1aff9389e9e59c9e7d85472a;hb=c4c12f133e22af6e3e193f3312e7cad61fa1b881;hp=c81c40c5941115a1754d48e75be8299abb0ef506;hpb=fba1ea06bb5b653e9eb0cc1b6004af8da273a4ab;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index c81c40c59..64d4785db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
+zshcompletiondir=@zshcompletiondir@
 rpmmacrosdir=$(prefix)/lib/rpm/macros.d
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@ -342,6 +343,11 @@ dist_bashcompletion_DATA = \
 	shell-completion/bash/udevadm \
 	shell-completion/bash/kernel-install
 
+dist_zshcompletion_DATA = \
+	shell-completion/zsh/_systemctl \
+	shell-completion/zsh/_journalctl \
+	shell-completion/zsh/_systemd
+
 dist_sysctl_DATA = \
 	sysctl.d/50-default.conf
 
@@ -3358,6 +3364,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
 	shell-completion/bash/hostnamectl
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_hostnamectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3434,6 +3443,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
 	shell-completion/bash/localectl
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_localectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3709,6 +3721,9 @@ rootbin_PROGRAMS += \
 dist_bashcompletion_DATA += \
 	shell-completion/bash/loginctl
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_loginctl
+
 systemd_inhibit_SOURCES = \
 	src/login/inhibit.c
 
@@ -4234,9 +4249,6 @@ EXTRA_DIST += \
 	docs/sysvinit/README.in \
 	docs/var-log/README.in
 
-EXTRA_DIST += \
-	shell-completion/systemd-zsh-completion.zsh
-
 SOCKETS_TARGET_WANTS += \
 	systemd-initctl.socket \
 	systemd-shutdownd.socket
@@ -4351,6 +4363,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
+	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr