From: Julian Andres Klode Date: Mon, 15 Aug 2016 10:55:51 +0000 (+0200) Subject: CMake: Install bash completions via cmake X-Git-Tag: 1.3_rc2~18 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1bb40ea62efc5eafc93d3739c9082e8f7e1a0e53 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 3263bea82..8b242a5d0 100644 --- 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 index 000000000..4ef62a892 --- /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 82b9ec6f4..a8a56c925 100644 --- 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