diff --git a/Makefile b/Makefile index 6c4fe97..1262808 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,7 @@ CMAKE=/usr/bin/cmake MESON=/usr/bin/meson # Paths for installed apps -BIN_SYSTEM_PATH=/usr/local/bin -INC_SYSTEM_PATH=/usr/include +INCLUDE_SYS_PATH=/usr/include # Set the default target to build .DEFAULT_GOAL := build @@ -13,7 +12,7 @@ INC_SYSTEM_PATH=/usr/include # Build and install tomlplusplus if it's not on the system tomlplusplus: git clone https://github.com/marzer/tomlplusplus.git -__Tomlplusplus = $(INC_SYSTEM_PATH)/toml++ +__Tomlplusplus = $(INCLUDE_SYS_PATH)/toml++ $(__Tomlplusplus): tomlplusplus @echo "Building and installing tomlplusplus..." cd tomlplusplus && $(MESON) setup build --buildtype=release --prefix=/usr @@ -26,8 +25,8 @@ $(__Tomlplusplus): tomlplusplus hyprcursor: git submodule init git submodule update --remote hyprcursor -__Hypercursor = $(INC_SYSTEM_PATH)/hyprcursor.hpp -$(__Hypercursor): $(__Hyperlang) +__Hyprcursor = $(INCLUDE_SYS_PATH)/hyprcursor.hpp +$(__Hyprcursor): $(__Hyperlang) @[[ -z "$(ls -A hyprcursor)" ]] && $(MAKE) hyprcursor $(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_PREFIX:PATH=/usr -S ./hyprcursor -B ./hyprcursor/build @@ -42,7 +41,7 @@ $(__Hypercursor): $(__Hyperlang) hyprutils: git submodule init git submodule update --remote hyprutils -__Hyprutils = $(INC_SYSTEM_PATH)/hyprutils +__Hyprutils = $(INCLUDE_SYS_PATH)/hyprutils $(__Hyprutils): @[[ -z "$(ls -A hyprutils)" ]] && $(MAKE) hyprutils $(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \ @@ -57,7 +56,7 @@ $(__Hyprutils): hyprlang: git submodule init git submodule update --remote hyprlang -__Hyprlang = $(INC_SYSTEM_PATH)/hyprlang.hpp +__Hyprlang = $(INCLUDE_SYS_PATH)/hyprlang.hpp $(__Hyprlang): $(__Hyprutils) @[[ -z "$(ls -A hyprlang)" ]] && $(MAKE) hyprlang # built using cmake @@ -76,8 +75,8 @@ $(__Hyprlang): $(__Hyprutils) Hyprland: git submodule init git submodule update --remote Hyprland -__Hyperland = Hyprland/build -$(__Hyperland): $(__Hyperlang) $(__Hypercursor) +__Hyprland = Hyprland/build +$(__Hyprland): $(__Hyperlang) $(__Hypercursor) @[[ -z "$(ls -A Hyprland)" ]] && $(MAKE) Hyprland $(MAKE) -C Hyprland all