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

diff --git a/Makefile b/Makefile
index 51cfd7f..87b1b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,18 @@ all:
 	@echo
 	@echo "The following components were autodetected and will be installed:"
 	@echo " "$(DEFAULT_TARGETS)
-	@echo "You can use the TARGETS variable to override, e.g. \"make install TAGETS='autorandr pmutils'\"."
+	@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)"
+	@echo
+	@echo "You can use the TARGETS variable to override this, but need to set"
+	@echo "the SYSTEMD_UNIT_DIR, PM_SLEEPHOOKS_DIR and UDEV_RULES_DIR variables"
+	@echo "in case they were not detected correctly."
+	@echo
+	@echo 'E.g. "make install TARGETS='autorandr pmutils' PM_UTILS_DIR=/etc/pm/sleep.d".'
 	@echo
 	@echo "The following additional targets are available:"
 	@echo
@@ -24,71 +35,90 @@ 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
+DEFAULT_TARGETS+=autostart_config
 
 install_autostart_config:
 	install -D -m 644 contrib/etc/xdg/autostart/autorandr.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop
+ifneq ($(PREFIX),/usr/)
+	sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop
+endif
 
 uninstall_autostart_config:
 	rm -f ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop
 
+# Rules for systemd
+SYSTEMD_UNIT_DIR:=$(shell pkg-config --variable=systemdsystemunitdir systemd 2>/dev/null)
+ifneq (,$(SYSTEMD_UNIT_DIR))
+DEFAULT_TARGETS+=systemd
+endif
+
+install_systemd:
+	$(if $(SYSTEMD_UNIT_DIR),,$(error SYSTEMD_UNIT_DIR is not defined))
+	install -D -m 644 contrib/systemd/autorandr.service ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service
+ifneq ($(PREFIX),/usr/)
+	sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service
+endif
+	@echo
+	@echo "To activate the systemd unit, run this command as root:"
+	@echo "    systemctl daemon-reload"
+	@echo "    systemctl enable autorandr.service"
+	@echo
+
+uninstall_systemd:
+	$(if $(SYSTEMD_UNIT_DIR),,$(error SYSTEMD_UNIT_DIR is not defined))
+	rm -f ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service
+
 # Rules for pmutils
-PM_UTILS_DIR=/etc/pm/sleep.d
-HAVE_PMUTILS=$(shell [ -x /usr/sbin/pm-suspend ] && echo "y")
-ifeq ($(HAVE_PMUTILS),y)
+PM_SLEEPHOOKS_DIR:=$(shell pkg-config --variable=pm_sleephooks pm-utils 2>/dev/null)
+ifneq (,$(PM_SLEEPHOOKS_DIR))
+ifeq (,$(SYSTEMD_UNIT_DIR))
 DEFAULT_TARGETS+=pmutils
 endif
+endif
 
 install_pmutils:
-	install -D -m 755 contrib/pm-utils/40autorandr ${DESTDIR}/${PM_UTILS_DIR}/40autorandr
-
-uninstall_pmutils:
-	rm -f ${DESTDIR}/${PM_UTILS_DIR}/40autorandr
-
-# Rules for systemd
-SYSTEMD_UNIT_DIR=/etc/systemd/system/
-HAVE_SYSTEMD=$(shell grep -q systemd /proc/1/comm && echo "y")
-ifeq ($(HAVE_SYSTEMD),y)
-DEFAULT_TARGETS+=systemd
+	$(if $(PM_SLEEPHOOKS_DIR),,$(error PM_SLEEPHOOKS_DIR is not defined))
+	install -D -m 755 contrib/pm-utils/40autorandr ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr
+ifneq ($(PREFIX),/usr/)
+	sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr
 endif
 
-install_systemd:
-	install -D -m 644 contrib/systemd/autorandr-resume.service ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr-resume.service
+uninstall_pmutils:
+	$(if $(PM_SLEEPHOOKS_DIR),,$(error PM_SLEEPHOOKS_DIR is not defined))
+	rm -f ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr
 
-uninstall_systemd:
-	rm -f ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr-resume.service
 
 # Rules for udev
-UDEV_RULES_DIR=/etc/udev/rules.d
-HAVE_UDEV=$(shell [ -d "${UDEV_RULES_DIR}" ] && echo "y")
-ifeq ($(HAVE_UDEV),y)
+UDEV_RULES_DIR:=$(shell pkg-config --variable=udevdir udev 2>/dev/null)/rules.d
+ifneq (,$(UDEV_RULES_DIR),y)
 DEFAULT_TARGETS+=udev
 endif
 
 install_udev:
-	install -D -m 644 contrib/udev/40-monitor-hotplug.rules ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
-ifeq (${USER},root)
-	udevadm control --reload-rules
-else
-	@echo "Please run this command as root:"
+	$(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 --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"
-endif
+	@echo
 
 uninstall_udev:
+	$(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined))
 	rm -f ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules