X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=blobdiff_plain;f=Makefile;h=87b1b4dd0a9ac434d39e496bea4b826bc7a2205f;hp=7125730d3bfe285ce6d70760e4d0bc3928ec8bea;hb=refs%2Fheads%2Fwork;hpb=28dc3cdea619b909dd5caf46952c7bdf5bab9f47

diff --git a/Makefile b/Makefile
index 7125730..87b1b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ all:
 	@echo " "$(DEFAULT_TARGETS)
 	@echo
 	@echo "The following locations have been detected (from pkg-config):"
+	@echo " - BASH_COMPLETIONS_DIR: $(BASH_COMPLETIONS_DIR)"
 	@echo " - SYSTEMD_UNIT_DIR: $(SYSTEMD_UNIT_DIR)"
 	@echo " - UDEV_RULES_DIR: $(UDEV_RULES_DIR)"
 	@echo " - PM_SLEEPHOOKS_DIR: $(PM_SLEEPHOOKS_DIR)"
@@ -34,18 +35,17 @@ install_autorandr:
 uninstall_autorandr:
 	rm -f ${DESTDIR}${PREFIX}/bin/autorandr
 
-# Rules for bash_completion
-BASH_COMPLETION_DIR=/etc/bash_completion.d
-HAVE_BASH_COMPLETION=$(shell [ -d /etc/bash_completion.d/ ] && echo "y")
-ifeq ($(HAVE_BASH_COMPLETION),y)
+# Rules for bash-completion
+BASH_COMPLETIONS_DIR:=$(shell pkg-config --variable=completionsdir bash-completion 2>/dev/null)
+ifneq (,$(BASH_COMPLETIONS_DIR))
 DEFAULT_TARGETS+=bash_completion
 endif
 
 install_bash_completion:
-	install -D -m 644 contrib/bash_completion/autorandr ${DESTDIR}/${BASH_COMPLETION_DIR}/autorandr
+	install -D -m 644 contrib/bash_completion/autorandr ${DESTDIR}/${BASH_COMPLETIONS_DIR}/autorandr
 
 uninstall_bash_completion:
-	rm -f ${DESTDIR}/${BASH_COMPLETION_DIR}/autorandr
+	rm -f ${DESTDIR}/${BASH_COMPLETIONS_DIR}/autorandr
 
 # Rules for autostart config
 XDG_AUTOSTART_DIR=/etc/xdg/autostart
@@ -111,7 +111,7 @@ endif
 install_udev:
 	$(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined))
 	mkdir -p ${DESTDIR}/${UDEV_RULES_DIR}/
-	echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
+	echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
 	@echo
 	@echo "To activate the udev rules, run this command as root:"
 	@echo "    udevadm control --reload-rules"