Merge branch 'release-1.2'
This commit is contained in:
		
						commit
						a9a137c6ca
					
				
							
								
								
									
										8
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								Makefile
									
									
									
									
									
								
							| @ -6,12 +6,12 @@ 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 +21,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 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user