From 5ebadd41ca7e6f78f9c592652c55ebc1aea9b4e2 Mon Sep 17 00:00:00 2001
From: TheOnePath <ethan.sc@closedless.xyz>
Date: Tue, 18 Jun 2024 19:48:19 +0100
Subject: [PATCH] Updated Makefile

Fixed bug with hyprutils and made the git commands their own target. Changed how tomlplusplus is installed.
---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 04aa546..a3c7b89 100644
--- a/Makefile
+++ b/Makefile
@@ -32,12 +32,11 @@ $(__Hypercursor): $(__Hyperlang)
 	sudo $(CMAKE) --install hyprcursor/build
 
 # Build hyprutils if the .hpp file is not installed
+hyprutils:
+	git submodule init
+	git submodule update --remote hyprutils
 __Hyprutils = $(INC_SYSTEM_PATH)/hyprutils.hpp
-$(__Hyprutils):
-	@if [ ! -d hyprutils ]; then\
-		git submodule init
-		git submodule update --remote hyprutils;\
-	fi
+$(__Hyprutils): hyprutils
 	$(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr -S hyprutils -B ./hyprutils/build
 	$(CMAKE) --build ./hyprutils/build --config Release --target all -j`nproc \
@@ -101,7 +100,8 @@ $(__Tomlplusplus): tomlplusplus
 	@echo "Building and installing tomlplusplus..."
 	cd tomlplusplus && $(MESON) setup build --buildtype=release
 	ninja -C tomlplusplus/build
-	sudo $(MESON) install -C tomlplusplus/build
+	DESTDIR=$(INC_SYSTEM_PATH)/toml++ \
+			sudo $(MESON) install -C tomlplusplus/build
 
 ### PHONY targets that a user would run ###
 .PHONY : build