Update scripts' PREFIX in Makefile's install targets

diff --git a/Makefile b/Makefile
index 797bf597bade630b917ca513696558825f36b7e4..6c3513c698ee746be2afd335da9255fb6ac22084 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,9 @@ 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
@@ -66,6 +69,9 @@ 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
 
 uninstall_systemd:
        $(if $(SYSTEMD_UNIT_DIR),,$(error SYSTEMD_UNIT_DIR is not defined))
@@ -82,6 +88,9 @@ endif
 install_pmutils:
        $(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
 
 uninstall_pmutils:
        $(if $(PM_SLEEPHOOKS_DIR),,$(error PM_SLEEPHOOKS_DIR is not defined))

diff --git a/contrib/pm-utils/40autorandr b/contrib/pm-utils/40autorandr
index a80926091539b6bb9c4cfe768f074e697ddd363f..d641957142be6ce0bd7a71d3a8d9ef10e0a68bb6 100755 (executable)
--- a/contrib/pm-utils/40autorandr
+++ b/contrib/pm-utils/40autorandr
@@ -5,6 +5,6 @@ exec > /var/log/autorandr.log 2>&1
 
 case "$1" in
        thaw|resume)
-               autorandr --batch -c --default default
+               /usr/bin/autorandr --batch --change --default default
                ;;
 esac

diff --git a/contrib/systemd/autorandr.service b/contrib/systemd/autorandr.service
index a013fa0792a61caaad002a6ebbccd81e9c5c6b04..d9708af49c51ee4b3d4b816389408323fe2d07f2 100644 (file)
--- a/contrib/systemd/autorandr.service
+++ b/contrib/systemd/autorandr.service
@@ -3,7 +3,7 @@ Description=autorandr execution hook
 After=sleep.target
 
 [Service]
-ExecStart=/usr/local/bin/autorandr --batch --change --default default
+ExecStart=/usr/bin/autorandr --batch --change --default default
 Type=oneshot
 RemainAfterExit=false
 

diff --git a/contrib/udev/40-monitor-hotplug.rules b/contrib/udev/40-monitor-hotplug.rules
deleted file mode 100644 (file)
index 792fe34..0000000
--- a/contrib/udev/40-monitor-hotplug.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="change", SUBSYSTEM=="drm", RUN+="/bin/systemctl start autorandr.service"