X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=c2d4b8c564ae2beba489e751fe88d292d6be96da;hp=19014a31670e0c82b0c6d5c3fc64cf946cdf4bb1;hb=aaa9cadece6367128e76b069e4ce866e007a6523;hpb=72db580cc640e36249e19d1d513856935848324d

diff --git a/Makefile b/Makefile
index 19014a3..c2d4b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,11 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 ifeq ($(shell uname),Darwin)
+	GREP := ggrep
 	SED := gsed
 	DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
 else
+	GREP := grep
 	SED  := sed
 	DIFF := diff
 endif
@@ -19,6 +21,8 @@ endif
     diff \
     pull \
     mpdconf \
+    pkgs_void \
+    pkgs_void_update \
     pkgs_brew_cask_install \
     pkgs_brew_install \
     pkgs_cargo \
@@ -41,11 +45,11 @@ home: mpdconf compiled
 	cp -Rp bin $(HOME)/
 	# Limit depth because directories are copied recursively:
 	find home -maxdepth 1 -print0 \
-	| grep -zv '^home$$' \
+	| $(GREP) -zv '^home$$' \
 	| xargs -0 -I% cp -Rp % ~
 
 mpdconf:
-	mkdir -p ~/Archives/Audio
+	mkdir -p ~/arc/aud
 	mkdir -p ~/var/lib/mpd/playlists
 	mkdir -p ~/var/log/mpd
 	mkdir -p ~/var/run/mpd
@@ -59,11 +63,22 @@ compiled:
 font_cache:
 	fc-cache -fv
 
+#
+# Void Linux
+#
+
+pkgs_void:
+	sudo xbps-install $(shell ./list pkgs-void.list)
+
+pkgs_void_update:
+	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u > pkgs-void.list
+	patch pkgs-void.list pkgs-void.list.comments.patch
+
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -78,10 +93,10 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 # PIP
 #
 pkgs_pip_install:
-	pip3 install --user $(shell ./list pkgs-pip.list)
+	pip install --user $(shell ./list pkgs-pip.list)
 
 pkgs_pip_upgrade:
-	pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
+	pip install --user --upgrade $(shell ./list pkgs-pip.list)
 
 #
 # Rust (cargo)