Merge branch 'release-1.2'

Fix broken path when using Destdir
2022-07-31 13:17:45 +02:00 · 2022-07-31 13:17:24 +02:00 · 2022-07-31 13:03:54 +02:00 · 2022-07-31 13:03:46 +02:00 · 2022-07-31 13:03:36 +02:00
1 changed files with 7 additions and 6 deletions
--- a/13
+++ b/13
@ -1,17 +1,18 @@
-KSMSERVER_NOTIFY_CONFIG_PATH=~/.config/ksmserver.notifyrc
-SCRIPT_PATH=~/.local/bin/event_screensaver
+DESTDIR=~/
+KSMSERVER_NOTIFY_CONFIG_PATH=.config/ksmserver.notifyrc
+SCRIPT_PATH=.local/bin/event_screensaver

 .PHONY: install remove
 default: install

 install:
 	# Deploy script
-	cp -f ./event_screensaver ${SCRIPT_PATH}
+	cp -f ./event_screensaver ${DESTDIR}${SCRIPT_PATH}
 	# Make executeable
-	chmod +x ${SCRIPT_PATH}
+	chmod +x ${DESTDIR}${SCRIPT_PATH}

 	# Deploy notifyrc-file
-	cp ./ksmserver.notifyrc ${KSMSERVER_NOTIFY_CONFIG_PATH}
+	cp ./ksmserver.notifyrc ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}

 	# Reload kwin..
 	qdbus org.kde.KWin /KWin reconfigure
@ -21,7 +22,7 @@ install:

 remove:
 	# Remove files..
-	rm ${SCRIPT_PATH} ${KSMSERVER_NOTIFY_CONFIG_PATH}
+	rm ${DESTDIR}${SCRIPT_PATH} ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}

 	# Reload kwin..
 	qdbus org.kde.KWin /KWin reconfigure
Author	SHA1	Message	Date
Ruakij	2e069fc517	Merge branch 'release-1.2'	2022-07-31 13:17:45 +02:00
Ruakij	e9c683a4a1	Fix broken path when using Destdir	2022-07-31 13:17:24 +02:00
Ruakij	a9a137c6ca	Merge branch 'release-1.2'	2022-07-31 13:03:54 +02:00
Ruakij	a5d74e505d	Merge branch 'dev' into release-1.2	2022-07-31 13:03:46 +02:00
Ruakij	b0fc7947d0	Add optional Destdir-variable	2022-07-31 13:03:36 +02:00