Bash completion: install as /usr/share/bash-completion/completions/openconnect

This is the common default installation pattern for quite some time

Signed-off-by: Luca Boccassi <bluca@debian.org>

diff --git a/Makefile.am b/Makefile.am
index ac155aab2857126a71aa195dafb48df9eb62dc17..feb91168a69622fc47d5e96219ae14063d94bbd9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,8 +142,8 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 pkglibexec_SCRIPTS = trojans/csd-post.sh trojans/csd-wrapper.sh trojans/tncc-wrapper.py \
        trojans/hipreport.sh trojans/hipreport-android.sh
 
-bashcompletiondir = $(sysconfdir)/bash_completion.d
-bashcompletion_DATA = bash/openconnect.bash
+bashcompletiondir = $(datadir)/bash-completion/completions
+bashcompletion_DATA = bash/openconnect
 
 # main.c includes version.c
 openconnect-main.$(OBJEXT): version.c

diff --git a/bash/openconnect.bash b/bash/openconnect
similarity index 100%
rename from bash/openconnect.bash
rename to bash/openconnect

diff --git a/www/changelog.xml b/www/changelog.xml
index bcbcc94e6af30557fd4c84670d468eac603d8668..89d999b1f54355d518aa5006cab223bcc63619af 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -15,7 +15,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
-       <li><i>No changelog entries yet</i></li>
+       <li>Install bash completion script as /usr/share/bash-completion/completions/openconnect.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz">OpenConnect v8.09</a></b>