From: Jack Humbert Date: Fri, 27 Jan 2017 16:23:02 +0000 (-0500) Subject: Merge pull request #869 from dylanjgscott/master X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a28f6893878f60509a7796637192fedb4be38d45;p=qmk_firmware.git Merge pull request #869 from dylanjgscott/master Use `type cmp` to test for cmp in Makefile --- a28f6893878f60509a7796637192fedb4be38d45 diff --cc Makefile index 9cc77c55c,636eae3e5..550be8195 --- a/Makefile +++ b/Makefile @@@ -485,11 -485,10 +485,11 @@@ $(SUBPROJECTS): %: %-allk # Let's match everything, we handle all the rule parsing ourselves .PHONY: % -%: +%: # Check if we have the CMP tool installed - cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; # Check if the submodules are dirty, and display a warning if they are +ifndef SKIP_GIT git submodule status --recursive 2>/dev/null | \ while IFS= read -r x; do \ case "$$x" in \