summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-03-02 22:34:01 +0100
committerMichael Biebl <biebl@debian.org>2013-03-03 14:39:51 +0100
commitd611dadcc74db10ba533ee6859308f5fc505aee1 (patch)
tree65197630b8706b4edb0200278464551a7d2518e2 /Makefile.am
parent076a24adf4bfbb9c5aa8167e102c253c7e1c651e (diff)
bash-completion: split completions and move to new location
Split the large bash completion script into separate, smaller files each named after the binary it is used for and move the files to /usr/share/bash-completion/completions. This way the completions can be loaded on demand and we only install the completions for the tools we actually build. The old path /etc/bash_completion.d/ is deprecated and will disappear in the future.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am19
1 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index b69794994d..6e12a43ddf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=$(sysconfdir)/bash_completion.d
+bashcompletiondir=$(datadir)/bash-completion/completions
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@ -316,7 +316,10 @@ systemd_analyze_LDADD = \
libsystemd-dbus.la
dist_bashcompletion_DATA = \
- shell-completion/systemd-bash-completion.sh
+ shell-completion/bash/journalctl \
+ shell-completion/bash/systemctl \
+ shell-completion/bash/systemd-coredumpctl \
+ shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
@@ -2972,6 +2975,9 @@ hostnamectl_LDADD = \
bin_PROGRAMS += \
hostnamectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/hostnamectl
+
endif
polkitpolicy_in_files += \
@@ -3045,6 +3051,9 @@ localectl_LDADD = \
bin_PROGRAMS += \
localectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/localectl
+
endif
polkitpolicy_in_files += \
@@ -3111,6 +3120,9 @@ timedatectl_LDADD = \
bin_PROGRAMS += \
timedatectl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/timedatectl
endif
polkitpolicy_in_files += \
@@ -3233,6 +3245,9 @@ loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/loginctl
+
systemd_inhibit_SOURCES = \
src/login/inhibit.c