Merge branch 'dev' into release-1.2
This commit is contained in:
commit
a5d74e505d
8
Makefile
8
Makefile
@ -6,12 +6,12 @@ default: install
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
# Deploy script
|
# Deploy script
|
||||||
cp -f ./event_screensaver ${SCRIPT_PATH}
|
cp -f ./event_screensaver ${DESTDIR}${SCRIPT_PATH}
|
||||||
# Make executeable
|
# Make executeable
|
||||||
chmod +x ${SCRIPT_PATH}
|
chmod +x ${DESTDIR}${SCRIPT_PATH}
|
||||||
|
|
||||||
# Deploy notifyrc-file
|
# Deploy notifyrc-file
|
||||||
cp ./ksmserver.notifyrc ${KSMSERVER_NOTIFY_CONFIG_PATH}
|
cp ./ksmserver.notifyrc ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}
|
||||||
|
|
||||||
# Reload kwin..
|
# Reload kwin..
|
||||||
qdbus org.kde.KWin /KWin reconfigure
|
qdbus org.kde.KWin /KWin reconfigure
|
||||||
@ -21,7 +21,7 @@ install:
|
|||||||
|
|
||||||
remove:
|
remove:
|
||||||
# Remove files..
|
# Remove files..
|
||||||
rm ${SCRIPT_PATH} ${KSMSERVER_NOTIFY_CONFIG_PATH}
|
rm ${DESTDIR}${SCRIPT_PATH} ${DESTDIR}${KSMSERVER_NOTIFY_CONFIG_PATH}
|
||||||
|
|
||||||
# Reload kwin..
|
# Reload kwin..
|
||||||
qdbus org.kde.KWin /KWin reconfigure
|
qdbus org.kde.KWin /KWin reconfigure
|
||||||
|
Loading…
x
Reference in New Issue
Block a user