CMake: Install bash completions via cmake

Having the completions installed only by the packaging was
an oversight.

Gbp-Dch: ignore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3263bea82ff4a0b88e9853bff5aa3725a791b62c..8b242a5d035929c361305efb9c927e40748fbf0c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,6 +133,7 @@ add_subdirectory(apt-pkg)
 add_subdirectory(apt-private)
 add_subdirectory(apt-inst)
 add_subdirectory(cmdline)
+add_subdirectory(completions)
 add_subdirectory(doc)
 add_subdirectory(dselect)
 add_subdirectory(ftparchive)

diff --git a/completions/CMakeLists.txt b/completions/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4ef62a8
--- /dev/null
+++ b/completions/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(BASH_COMPLETION_DIR "${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions"
+    CACHE PATH "Path to the bash-completion completions directory")
+
+install(FILES bash/apt DESTINATION ${BASH_COMPLETION_DIR})

diff --git a/debian/apt.install b/debian/apt.install
index 82b9ec6f45a45d25a6c71fee648418a7c7e27283..a8a56c925cb3b16d1b03ae22c80b435b22dbde70 100644 (file)
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -29,7 +29,7 @@ usr/share/man/*/*/apt-mark.*
 usr/share/man/*/*/apt-secure.*
 usr/share/man/*/*/sources.list.*
 usr/share/man/*/*/apt_preferences.*
-completions/bash/* /usr/share/bash-completion/completions/
+usr/share/bash-completion/completions/
 debian/*.service /lib/systemd/system/
 debian/*.timer /lib/systemd/system/
 usr/lib/apt/apt-helper