From cea4b9a4bb4090b20612a43efa3378b95a6dcac0 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <htgoebel@users.noreply.github.com>
Date: Tue, 31 May 2016 16:03:04 +0200
Subject: Update to Makefile an ergodox readme (#365)

* Autodetect teensy-loader-cli over teensy_loader_cli.

Some distributions (e.g. Arch Linux, Guix) install teensy_loader_cli
as teensy-loader-cli. Use this one if it is installed.

* Update ergodox_ez/readme.md

- Mention Linux distris providing teensy-loader-cli
- Mention `make teensy ...`
---
 tmk_core/rules.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'tmk_core/rules.mk')

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 37be850f8..326d2a787 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -317,7 +317,12 @@ REMOVE = rm -f
 REMOVEDIR = rmdir
 COPY = cp
 WINSHELL = cmd
-
+# Autodecct teensy loader
+ifneq (, $(shell which teensy-loader-cli 2>/dev/null)))
+  TEENSY_LOADER_CLI = teensy-loader-cli
+else
+  TEENSY_LOADER_CLI = teensy_loader_cli
+endif
 
 # Define Messages
 # English
@@ -425,7 +430,7 @@ program: $(TARGET).hex $(TARGET).eep
 	$(PROGRAM_CMD)
 
 teensy: $(TARGET).hex
-	teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+	$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(TARGET).hex
 
 flip: $(TARGET).hex
 	batchisp -hardware usb -device $(MCU) -operation erase f
-- 
cgit v1.2.3-70-g09d2