From 25af8ba5fcec5fc690469e5600835505006981de Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Wed, 2 Dec 2020 15:07:29 +0100
Subject: [PATCH] Merged stash

---
 CHANGELOG.md |  4 ++--
 Makefile     | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92e2575..3bace10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 ## v0.1
 * Switched build to CMake
 * Completely overhauled code structure
+* Add a desktop entry when installing
+  based on [desktopentry](https://st.suckless.org/patches/desktopentry/)
 
 ## v0.2
 * Configurable transparency (focused and unfocused)
@@ -11,8 +13,6 @@
   based on [anysize](https://st.suckless.org/patches/anysize/)
 * Copy to clipboard on selection
   based on [one clipboard](https://st.suckless.org/patches/clipboard/)
-* Add a desktop entry when installing
-  based on [desktopentry](https://st.suckless.org/patches/desktopentry/)
 
 ## v0.3
 * Add better/gapless rendering of lines/blocks
diff --git a/Makefile b/Makefile
index 5ba4d9a..da3b99c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,20 +16,20 @@ all: debug
 
 # =====INSTALL & UNINSTALL=====
 install: release
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f build/release/stj $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/stj
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < data/stj.1 > $(DESTDIR)$(MANPREFIX)/man1/stj.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stj.1
-	tic -sx data/stj.info
-	cp -f data/stj.desktop $(DESTDIR)$(PREFIX)/share/applications
+	@ mkdir -p '$(DESTDIR)$(PREFIX)/bin'
+	@ cp -f '$(RELEASE_DIR)/$(BINARY)' '$(DESTDIR)$(PREFIX)/bin'
+	@ chmod 755 '$(DESTDIR)$(PREFIX)/bin/$(BINARY)'
+	@ mkdir -p '$(DESTDIR)$(MANPREFIX)/man1'
+	@ sed "s/VERSION/$(VERSION)/g" < 'data/stj.1' > '$(DESTDIR)$(MANPREFIX)/man1/$(BINARY).1'
+	@ chmod 644 '$(DESTDIR)$(MANPREFIX)/man1/$(BINARY).1'
+	@ tic -sx 'data/stj.info'
+	@ cp -f 'data/$(BINARY).desktop' '$(DESTDIR)$(PREFIX)/share/applications'
 .PHONY: install
 
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/stj
-	rm -f $(DESTDIR)$(MANPREFIX)/man1/stj.1
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/stj.desktop
+	@ rm -f '$(DESTDIR)$(PREFIX)/bin/$(BINARY)'
+	@ rm -f '$(DESTDIR)$(MANPREFIX)/man1/$(BINARY).1'
+	@ rm -f '$(DESTDIR)$(PREFIX)/share/applications/$(BINARY).desktop'
 .PHONY: uninstall