X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=abcaefb08527cc69aadb3e5cff50ad7d25528d28;hp=69ee41fcaa4ec05dba3941510ca1d3910b802c8f;hb=55115ac1255c2c915eca460b0a95d8c5b385947a;hpb=99e81ec20c0fa6dc0ce3c79333e48c9920adde5c

diff --git a/Makefile b/Makefile
index 69ee41f..abcaefb 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
@@ -38,18 +40,18 @@ default:
 	@exit 1
 
 home: mpdconf compiled
-	@cp  -Rp       bin           $(HOME)/
+	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 ~/var/lib/mpd/playlists
-	@mkdir -p ~/var/log/mpd
-	@mkdir -p ~/var/run/mpd
-	@cp home/.mpdconf $(HOME)/
+	mkdir -p ~/arc/aud
+	mkdir -p ~/var/lib/mpd/playlists
+	mkdir -p ~/var/log/mpd
+	mkdir -p ~/var/run/mpd
+	cp home/.mpdconf $(HOME)/
 
 compiled:
 	mkdir -p bin
@@ -57,13 +59,13 @@ compiled:
 	mv src/clockloop bin/
 
 font_cache:
-	@fc-cache -fv
+	fc-cache -fv
 
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu