diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-09-17 20:24:28 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-09-17 21:00:04 +0300 |
| commit | 8ae885a0c6dc67aca0adc880b7b61bb3795a7682 (patch) | |
| tree | 83a12f2ad93d7287272dd4c02e10070a889f7e9a | |
| parent | ee324c501eee738bedf917123abae4eb613268f8 (diff) | |
| download | micropython-8ae885a0c6dc67aca0adc880b7b61bb3795a7682.tar.gz micropython-8ae885a0c6dc67aca0adc880b7b61bb3795a7682.zip | |
esp8266/Makefile: Rename SCRIPTDIR to FROZEN_DIR for consistency.
With FROZEN_MPY_DIR.
| -rw-r--r-- | esp8266/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index 433b41ecfd..e13082e186 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -14,7 +14,7 @@ MPY_CROSS = ../mpy-cross/mpy-cross MPY_TOOL = ../tools/mpy-tool.py MAKE_FROZEN = ../tools/make-frozen.py -SCRIPTDIR = scripts +FROZEN_DIR = scripts FROZEN_MPY_DIR = modules PORT ?= /dev/ttyACM0 BAUD ?= 115200 @@ -164,16 +164,16 @@ CONFVARS_FILE = $(BUILD)/confvars ifeq ($(wildcard $(CONFVARS_FILE)),) $(shell $(MKDIR) -p $(BUILD)) -$(shell echo $(SCRIPTDIR) $(UART_OS) > $(CONFVARS_FILE)) -else ifneq ($(shell cat $(CONFVARS_FILE)), $(SCRIPTDIR) $(UART_OS)) -$(shell echo $(SCRIPTDIR) $(UART_OS) > $(CONFVARS_FILE)) +$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE)) +else ifneq ($(shell cat $(CONFVARS_FILE)), $(FROZEN_DIR) $(UART_OS)) +$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE)) endif $(BUILD)/uart.o: $(CONFVARS_FILE) -$(BUILD)/frozen.c: $(wildcard $(SCRIPTDIR)/*) $(CONFVARS_FILE) +$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(CONFVARS_FILE) $(ECHO) "Generating $@" - $(Q)$(MAKE_FROZEN) $(SCRIPTDIR) > $@ + $(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@ # to build .mpy files from .py files $(BUILD)/$(FROZEN_MPY_DIR)/%.mpy: $(FROZEN_MPY_DIR)/%.py |