From 754c61105cdc2e5c3badbb4299710e825f988349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Grondek?= <pgrondek@gmail.com>
Date: Mon, 25 Nov 2019 15:59:24 +0100
Subject: [PATCH] [i3] fix variables collision in makefile

---
 i3/i3blocks/Makefile | 6 ++++--
 i3/playerctl.mk      | 8 ++++----
 i3/redshift.mk       | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/i3/i3blocks/Makefile b/i3/i3blocks/Makefile
index f68d8ff..bac8f63 100644
--- a/i3/i3blocks/Makefile
+++ b/i3/i3blocks/Makefile
@@ -1,3 +1,5 @@
+include *.mk
+
 CONFIG=config
 CONFIG_OUT=$(HOME)/.config/i3blocks/config
 CONFIG_DIR=$(HOME)/.config/i3blocks
@@ -9,11 +11,11 @@ OUT=$(I3_CONFIG_OUT)
 
 clean_install: clean install
 
-clean:
+clean: clean_gsimplecal
 	rm -rf $(CONFIG_OUT)
 	rm -rf $(CONFIG_DIR)
 
-install: $(CONFIG_DIR)
+install: $(CONFIG_DIR) install_gsimplecal
 	cp $(CONFIG) $(CONFIG_OUT)
 	cp $(BLOCKS) $(CONFIG_DIR)
 
diff --git a/i3/playerctl.mk b/i3/playerctl.mk
index b4fd0c8..52779b5 100644
--- a/i3/playerctl.mk
+++ b/i3/playerctl.mk
@@ -1,4 +1,4 @@
-PACKAGE=playerctl
+PACKAGE_PLAYERCTL=playerctl
 GITHUB_VERSION=2.0.2
 GITHUB_URL=https://github.com/altdesktop/playerctl/releases/download/v$(GITHUB_VERSION)/playerctl-$(GITHUB_VERSION)_amd64.deb
 
@@ -8,8 +8,8 @@ ROOT_APT=sudo aptitude
 install_playerctl: $(BIN)
 
 $(BIN):
-ifeq ($(shell aptitude search $PACKAGE 2&> /dev/null; echo $?), 0)
-	$(ROOT_APT) install $(PACKAGE)
+ifeq ($(shell aptitude search $(PACKAGE_PLAYERCTL) 2&> /dev/null; echo $?), 0)
+	$(ROOT_APT) install $(PACKAGE_PLAYERCTL)
 else
 	$(eval TMP = $(shell mktemp -d))
 	curl -fsSL $(GITHUB_URL) -o $(TMP)/playerctl.deb
@@ -19,4 +19,4 @@ else
 endif
 
 clean_playerctl:
-	$(ROOT_APT) remove $(PACKAGE)
+	$(ROOT_APT) remove $(PACKAGE_PLAYERCTL)
diff --git a/i3/redshift.mk b/i3/redshift.mk
index a6be8a4..47e5a51 100644
--- a/i3/redshift.mk
+++ b/i3/redshift.mk
@@ -1,11 +1,11 @@
-PACKAGE=redshift
+PACKAGE_REDSHIFT=redshift
 BIN=/usr/bin/redshift
 ROOT_APT=sudo aptitude
 
 install_redshift: $(BIN)
 
 $(BIN):
-	$(ROOT_APT) install $(PACKAGE)
+	$(ROOT_APT) install $(PACKAGE_REDSHIFT)
 
 clean_redshift:
-	$(ROOT_APT) remove $(PACKAGE)
+	$(ROOT_APT) remove $(PACKAGE_REDSHIFT)