X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=d54f46b4a13c55708c6285b1804f1172c380a576;hp=00513639ef8c6142852bc4fd808a88687b007384;hb=0b63d66210f0bfefc55e73d52409117496ecc7b5;hpb=034cb0c6ff1db5c9326f57bfa7b5669b021f0f3a diff --git a/Makefile b/Makefile index 0051363..d54f46b 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,14 @@ MAKEFLAGS := --no-builtin-rules DEPS := $(wildcard deps/*) +ifeq ($(shell uname),Darwin) + SED := gsed + DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1) +else + SED := sed + DIFF := diff +endif + .PHONY: \ default \ clean \ @@ -129,13 +137,13 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d)))) diff: find home -type f -print0 \ - | sed -z 's/^home\///g' \ - | xargs -0 -I% sh -c 'echo %; diff --color=always ~/% home/%' + | $(SED) -z 's/^home\///g' \ + | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=always ~/% home/%' pull: find home -type f -print0 \ - | sed -z 's/^home\///g' \ - | xargs -0 -I% sh -c 'diff -q ~/% home/% > /dev/null || cp ~/% home/%' + | $(SED) -z 's/^home\///g' \ + | xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%' clean: rm -rf ./debfiles