1 files changed, 26 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index bcc1005..50adaed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,32 @@
 BINDIR = /usr/local/bin
-BINARIES = firestart firestartx $(addprefix src/,sliceweasel.lib.sh firefox-io-slayer ioslay-firefox)
-SUDO != [ "$$(id -u)" = 0 ] || echo sudo
+BINARIES = firestart firestartx $(addprefix src/,sliceweasel.lib.sh firefox-io-slayer-redux ioslay-firefox)
 
-.PHONY: install install-bin
+ifeq ($(shell id -u),0)
+# Prevent running as root
+.PHONY: install-bin
+all:
+install-bin:
+        install $(BINARIES) -t $(BINDIR)
+else
+
+.PHONY: install install-bin start stop restart
+
+firefox@.service: src/firefox@.service.in src/generate-firefox-unit
+        ./src/generate-firefox-unit $< $@
+
+install: install-bin firefox@.service
+        systemctl --user link ./firefox@.service
+        systemctl --user link ./src/ioslay@.service
+        systemctl --user daemon-reload
+
+start: install
+        systemctl --user start "firefox@$$DISPLAY"
 
-install: install-bin
-        systemctl --user restart ioslay
+stop:
+        systemctl --user stop firefox@$$DISPLAY ioslay@$$DISPLAY
 
-uninstall-units:
-        systemctl --user disable ioslay
+restart: stop start
 
 install-bin:
-        $(SUDO) install $(BINARIES) -t $(BINDIR)
+        sudo $(MAKE) -$(MAKEFLAGS) $@
+endif