From 98bf70e3d133fe7402b144b035a502364af7e29c Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 21 May 2015 21:53:02 +0200 Subject: [PATCH] client: change location of bash completion --- debian/lldpd.install | 2 +- redhat/lldpd.spec | 2 +- src/client/Makefile.am | 6 +++--- src/client/{ => completion}/_lldpcli | 0 src/client/{lldpcli.bash-completion => completion/lldpcli} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename src/client/{ => completion}/_lldpcli (100%) rename src/client/{lldpcli.bash-completion => completion/lldpcli} (100%) diff --git a/debian/lldpd.install b/debian/lldpd.install index 0065ce1a..b85c2a80 100644 --- a/debian/lldpd.install +++ b/debian/lldpd.install @@ -2,6 +2,6 @@ debian/tmp/lib/systemd/system/lldpd.service debian/tmp/usr/lib/*.so.* debian/tmp/usr/share/man/man8/* debian/tmp/usr/sbin/lldp* -debian/tmp/etc/bash_completion.d/* +debian/tmp/usr/share/bash-completion/completions/* debian/tmp/usr/share/zsh/vendor-completions/* debian/tmp/etc/lldpd.d/* diff --git a/redhat/lldpd.spec b/redhat/lldpd.spec index 79429371..8ecc1f8e 100644 --- a/redhat/lldpd.spec +++ b/redhat/lldpd.spec @@ -225,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/lldpcli %{_libdir}/liblldpctl.so.* %{_datadir}/zsh -%{_sysconfdir}/bash_completion.d +%{_datadir}/bash-completion %doc %{_mandir}/man8/lldp* %config %{_sysconfdir}/lldpd.d %config %attr(755,root,root) %{_initrddir}/lldpd diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 0b86002a..eb476c00 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -44,10 +44,10 @@ lldpcli_LDADD += @JSONC_LIBS@ endif # Completions -bashcompletiondir = $(sysconfdir)/bash_completion.d -dist_bashcompletion_DATA = lldpcli.bash-completion +bashcompletiondir = $(datadir)/bash-completion/completions +dist_bashcompletion_DATA = completion/lldpcli zshcompletiondir = $(datadir)/zsh/vendor-completions -dist_zshcompletion_DATA = _lldpcli +dist_zshcompletion_DATA = completion/_lldpcli # Default configuration lldpdconfdir = $(sysconfdir)/lldpd.d diff --git a/src/client/_lldpcli b/src/client/completion/_lldpcli similarity index 100% rename from src/client/_lldpcli rename to src/client/completion/_lldpcli diff --git a/src/client/lldpcli.bash-completion b/src/client/completion/lldpcli similarity index 100% rename from src/client/lldpcli.bash-completion rename to src/client/completion/lldpcli -- 2.39.5