diff options
| author |  Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-30 12:59:17 +0100 |
|---|---|---|
| committer | Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-30 12:59:17 +0100 |
| commit | d43f4a5f57a9f7d9f3080305506d77faf81bf99b (patch) | |
| tree | d0061e0a9352b9d7de7f2730a17dd64fb7bf8ba6 /Makefile | |
| parent | d7aa4724fbfe51ad016a285797ae664eba5cc150 (diff) | |
| parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
| download | qmk_firmware-d43f4a5f57a9f7d9f3080305506d77faf81bf99b.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -487,7 +487,7 @@ $(SUBPROJECTS): %: %-allkm .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 | \ @@ -537,4 +537,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) -include $(ROOT_DIR)/testlist.mk
\ No newline at end of file +include $(ROOT_DIR)/testlist.mk |