client: change location of bash completion

diff --git a/debian/lldpd.install b/debian/lldpd.install
index 0065ce1aa7de5100ae83d2540fc843238649a599..b85c2a80a657d5403516b45744e46bac6d7ac221 100644 (file)
--- 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 79429371f50011af7f9aed719d4107b9a484039f..8ecc1f8e827b08cd996e3f34bf6d92ca9acddc9c 100644 (file)
--- 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 0b86002a358cf0835e1bf77746bffa61b4fc652b..eb476c00cf752c12d4d9b6a7383dd5e66cd2311f 100644 (file)
--- 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