diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-01-27 11:23:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 11:23:02 -0500 |
| commit | a28f6893878f60509a7796637192fedb4be38d45 (patch) | |
| tree | 6c42db6cda49a37a6008ebf8fa8fead9ba8da0c7 | |
| parent | 712f3de16f2c2930276bb97b6c5792d9a2213928 (diff) | |
| parent | 245f77b863b1dbea9d87381b5f5cff2516553d1d (diff) | |
| download | qmk_firmware-a28f6893878f60509a7796637192fedb4be38d45.tar.gz qmk_firmware-a28f6893878f60509a7796637192fedb4be38d45.zip | |
Merge pull request #869 from dylanjgscott/master
Use `type cmp` to test for cmp in Makefile
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -487,7 +487,7 @@ $(SUBPROJECTS): %: %-allkm | |||
| 487 | .PHONY: % | 487 | .PHONY: % |
| 488 | %: | 488 | %: |
| 489 | # Check if we have the CMP tool installed | 489 | # Check if we have the CMP tool installed |
| 490 | cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; | 490 | cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; |
| 491 | # Check if the submodules are dirty, and display a warning if they are | 491 | # Check if the submodules are dirty, and display a warning if they are |
| 492 | ifndef SKIP_GIT | 492 | ifndef SKIP_GIT |
| 493 | git submodule status --recursive 2>/dev/null | \ | 493 | git submodule status --recursive 2>/dev/null | \ |
| @@ -537,4 +537,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") | |||
| 537 | $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) | 537 | $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) |
| 538 | $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) | 538 | $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) |
| 539 | 539 | ||
| 540 | include $(ROOT_DIR)/testlist.mk \ No newline at end of file | 540 | include $(ROOT_DIR)/testlist.mk |