shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

zsh_completion: fix zsh completion installation

Browse Source 
Moved zsh shell completion to shell-completion/zsh/_systemd for
automake's sake. Also allow users to specify where the files should go
with::

  ./configure --with-zshcompletiondir=/path/to/some/where

and by default going to `$datadir/zsh/site-functions`
This commit is contained in:
William Giokas 2013-07-25 00:57:05 -05:00 committed by Zbigniew Jędrzejewski-Szmek
parent 58a6e9039a
commit 4f87c47b35
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -68,6 +68,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@ bashcompletiondir=@bashcompletiondir@
zshcompletiondir=@zshcompletiondir@
rpmmacrosdir=$(prefix)/lib/rpm/macros.d rpmmacrosdir=$(prefix)/lib/rpm/macros.d
sysvinitdir=$(SYSTEM_SYSVINIT_PATH) sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH) sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@ -342,6 +343,9 @@ dist_bashcompletion_DATA = \
shell-completion/bash/udevadm \ shell-completion/bash/udevadm \
shell-completion/bash/kernel-install shell-completion/bash/kernel-install
dist_zshcompletion_DATA = \
shell-completion/zsh/_systemd
dist_sysctl_DATA = \ dist_sysctl_DATA = \
sysctl.d/50-default.conf sysctl.d/50-default.conf
@ -4234,9 +4238,6 @@ EXTRA_DIST += \
docs/sysvinit/README.in \ docs/sysvinit/README.in \
docs/var-log/README.in docs/var-log/README.in
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
SOCKETS_TARGET_WANTS += \ SOCKETS_TARGET_WANTS += \
systemd-initctl.socket \ systemd-initctl.socket \
systemd-shutdownd.socket systemd-shutdownd.socket
@ -4351,6 +4352,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \ --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \ --with-rootprefix=$$dc_install_base \
--disable-split-usr --disable-split-usr

6
configure.ac
View File

@ -915,6 +915,10 @@ AC_ARG_WITH([bashcompletiondir],
with_bashcompletiondir=${datadir}/bash-completion/completions with_bashcompletiondir=${datadir}/bash-completion/completions
])]) ])])
AC_ARG_WITH([zshcompletiondir],
AS_HELP_STRING([--with-zshcompletiondir=DIR], [Zsh completions directory]),
[], [with_zshcompletiondir=${datadir}/zsh/site-functions])
AC_ARG_WITH([rootprefix], AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]), AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}]) [], [with_rootprefix=${ac_default_prefix}])
@ -959,6 +963,7 @@ AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir]) AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir]) AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
AC_SUBST([bashcompletiondir], [$with_bashcompletiondir]) AC_SUBST([bashcompletiondir], [$with_bashcompletiondir])
AC_SUBST([zshcompletiondir], [$with_zshcompletiondir])
AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_SUBST([rootlibdir], [$with_rootlibdir])
@ -1036,6 +1041,7 @@ AC_MSG_RESULT([
D-Bus system dir: ${with_dbussystemservicedir} D-Bus system dir: ${with_dbussystemservicedir}
D-Bus interfaces dir: ${with_dbusinterfacedir} D-Bus interfaces dir: ${with_dbusinterfacedir}
Bash completions dir: ${with_bashcompletiondir} Bash completions dir: ${with_bashcompletiondir}
Zsh completions dir: ${with_zshcompletiondir}
Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START}
Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP}
Debug shell: ${SUSHELL} @ ${DEBUGTTY} Debug shell: ${SUSHELL} @ ${DEBUGTTY}

0
shell-completion/systemd-zsh-completion.zsh → shell-completion/zsh/_systemd
View File