Install completions by default

This fixes #1262.

Makefile

@@ -215,9 +215,26 @@ install-dunstify: dunstify
 	install -Dm755 dunstify ${DESTDIR}${BINDIR}/dunstify
 endif
 
+ifneq (0,${COMPLETIONS})
+install: install-completions
+install-completions:
+	install -Dm644 contrib/dunst.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunst
+	install -Dm644 contrib/dunstctl.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
+	install -Dm644 contrib/_dunst.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
+	install -Dm644 contrib/_dunstctl.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
+	install -Dm644 contrib/dunst.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
+	install -Dm644 contrib/dunstctl.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
+
+ifneq (0,${DUNSTIFY})
+install: install-completions-dunstify
+install-completions-dunstify:
+	install -Dm644 contrib/dunstify.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify
+endif
+endif
+
 uninstall: uninstall-keepconf
 uninstall-purge: uninstall-keepconf uninstall-dunstrc
-uninstall-keepconf: uninstall-service uninstall-dunstctl
+uninstall-keepconf: uninstall-service uninstall-dunstctl uninstall-completions
 	rm -f ${DESTDIR}${BINDIR}/dunst
 	rm -f ${DESTDIR}${BINDIR}/dunstify
 	rm -f ${DESTDIR}${MANPREFIX}/man1/dunst.1
@@ -240,3 +257,12 @@ uninstall-service: uninstall-service-systemd
 uninstall-service-systemd:
 	rm -f ${DESTDIR}${SERVICEDIR_SYSTEMD}/dunst.service
 endif
+
+uninstall-completions:
+	rm -f ${DESTDIR}${BASHCOMPLETIONDIR}/dunst
+	rm -f ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
+	rm -f ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
+	rm -f ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify

config.mk

@@ -4,6 +4,9 @@ BINDIR ?= ${PREFIX}/bin
 SYSCONFDIR ?= ${PREFIX}/etc/xdg
 SYSCONFFILE ?= ${SYSCONFDIR}/dunst/dunstrc
 DATADIR ?= ${PREFIX}/share
+BASHCOMPLETIONDIR ?= ${DATADIR}/bash-completion/completions
+FISHCOMPLETIONDIR ?= ${DATADIR}/fish/vendor_completions.d
+ZSHCOMPLETIONDIR ?= ${DATADIR}/zsh/site-functions
 # around for backwards compatibility
 MANPREFIX ?= ${DATADIR}/man
 MANDIR ?= ${MANPREFIX}
@@ -36,6 +39,9 @@ VALGRIND ?= valgrind
 # Other applications will continue to work, as they use direct D-Bus.
 # DUNSTIFY ?=0
 
+# Disable installation of completions.
+# COMPLETIONS ?= 0
+
 ifneq (0, ${WAYLAND})
 ENABLE_WAYLAND= -DENABLE_WAYLAND
 endif

test/test-install.sh

@@ -31,9 +31,16 @@ systemd/dunst.service
 testprefix/bin/dunst
 testprefix/bin/dunstctl
 testprefix/bin/dunstify
+testprefix/share/bash-completion/completions/dunst
+testprefix/share/bash-completion/completions/dunstctl
+testprefix/share/fish/vendor_completions.d/dunst
+testprefix/share/fish/vendor_completions.d/dunstctl
+testprefix/share/fish/vendor_completions.d/dunstify
 testprefix/share/man/man1/dunst.1
 testprefix/share/man/man1/dunstctl.1
 testprefix/share/man/man5/dunst.5
+testprefix/share/zsh/site-functions/_dunst
+testprefix/share/zsh/site-functions/_dunstctl
 EOF
 
 do_make uninstall