pgrondek/config
1
0
Fork 0
mirror of https://github.com/pgrondek/config.git synced 2024-11-22 12:03:43 +00:00
Code Issues Releases Wiki Activity

[i3] fix variables collision in makefile

Browse Source
This commit is contained in:
Przemysław Grondek 2019-11-25 15:59:24 +01:00
parent 1ce12a5070
commit 754c61105c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3/i3blocks/Makefile
View File

@ -1,3 +1,5 @@
include *.mk
CONFIG=config CONFIG=config
CONFIG_OUT=$(HOME)/.config/i3blocks/config CONFIG_OUT=$(HOME)/.config/i3blocks/config
CONFIG_DIR=$(HOME)/.config/i3blocks CONFIG_DIR=$(HOME)/.config/i3blocks
@ -9,11 +11,11 @@ OUT=$(I3_CONFIG_OUT)
clean_install: clean install clean_install: clean install
clean: clean: clean_gsimplecal
rm -rf $(CONFIG_OUT) rm -rf $(CONFIG_OUT)
rm -rf $(CONFIG_DIR) rm -rf $(CONFIG_DIR)
install: $(CONFIG_DIR) install: $(CONFIG_DIR) install_gsimplecal
cp $(CONFIG) $(CONFIG_OUT) cp $(CONFIG) $(CONFIG_OUT)
cp $(BLOCKS) $(CONFIG_DIR) cp $(BLOCKS) $(CONFIG_DIR)

8
i3/playerctl.mk
View File

@ -1,4 +1,4 @@
PACKAGE=playerctl PACKAGE_PLAYERCTL=playerctl
GITHUB_VERSION=2.0.2 GITHUB_VERSION=2.0.2
GITHUB_URL=https://github.com/altdesktop/playerctl/releases/download/v$(GITHUB_VERSION)/playerctl-$(GITHUB_VERSION)_amd64.deb 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) install_playerctl: $(BIN)
$(BIN): $(BIN):
ifeq ($(shell aptitude search $PACKAGE 2&> /dev/null; echo $?), 0) ifeq ($(shell aptitude search $(PACKAGE_PLAYERCTL) 2&> /dev/null; echo $?), 0)
$(ROOT_APT) install $(PACKAGE) $(ROOT_APT) install $(PACKAGE_PLAYERCTL)
else else
$(eval TMP = $(shell mktemp -d)) $(eval TMP = $(shell mktemp -d))
curl -fsSL $(GITHUB_URL) -o $(TMP)/playerctl.deb curl -fsSL $(GITHUB_URL) -o $(TMP)/playerctl.deb
@ -19,4 +19,4 @@ else
endif endif
clean_playerctl: clean_playerctl:
$(ROOT_APT) remove $(PACKAGE) $(ROOT_APT) remove $(PACKAGE_PLAYERCTL)

6
i3/redshift.mk
View File

@ -1,11 +1,11 @@
PACKAGE=redshift PACKAGE_REDSHIFT=redshift
BIN=/usr/bin/redshift BIN=/usr/bin/redshift
ROOT_APT=sudo aptitude ROOT_APT=sudo aptitude
install_redshift: $(BIN) install_redshift: $(BIN)
$(BIN): $(BIN):
$(ROOT_APT) install $(PACKAGE) $(ROOT_APT) install $(PACKAGE_REDSHIFT)
clean_redshift: clean_redshift:
$(ROOT_APT) remove $(PACKAGE) $(ROOT_APT) remove $(PACKAGE_REDSHIFT)