conditionaly include "local.conf" from Makefile

for convenience reasons included from Makefile, added to gitignore..
9 years ago · bb5dfd082a
parent d092075818
commit bb5dfd082a
2 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@ esp-link.sdf
 espfs/mkespfsimage/mman-win32/libmman.a
 .localhistory/
 tools/
+local.conf
--- a/2
+++ b/2
@ -8,6 +8,8 @@
 # `VERBOSE=1 make ...` will print debug info
 # `ESP_HOSTNAME=my.esp.example.com make wiflash` is an easy way to override a variable
 #
+# optional local configuration file
+-include local.conf
 # Makefile heavily adapted to esp-link and wireless flashing by Thorsten von Eicken
 # Lots of work, in particular to support windows, by brunnels
 # Original from esphttpd and others...