Skip to content

Commit 8ae885a

Browse files
pfalconpfalcon
committed
esp8266/Makefile: Rename SCRIPTDIR to FROZEN_DIR for consistency.
With FROZEN_MPY_DIR.
1 parent ee324c5 commit 8ae885a

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎esp8266/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ MPY_CROSS = ../mpy-cross/mpy-cross
1414
MPY_TOOL = ../tools/mpy-tool.py
1515
MAKE_FROZEN = ../tools/make-frozen.py
1616

17-
SCRIPTDIR = scripts
17+
FROZEN_DIR = scripts
1818
FROZEN_MPY_DIR = modules
1919
PORT ?= /dev/ttyACM0
2020
BAUD ?= 115200
@@ -164,16 +164,16 @@ CONFVARS_FILE = $(BUILD)/confvars
164164

165165
ifeq ($(wildcard $(CONFVARS_FILE)),)
166166
$(shell $(MKDIR) -p $(BUILD))
167-
$(shell echo $(SCRIPTDIR) $(UART_OS) > $(CONFVARS_FILE))
168-
else ifneq ($(shell cat $(CONFVARS_FILE)), $(SCRIPTDIR) $(UART_OS))
169-
$(shell echo $(SCRIPTDIR) $(UART_OS) > $(CONFVARS_FILE))
167+
$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE))
168+
else ifneq ($(shell cat $(CONFVARS_FILE)), $(FROZEN_DIR) $(UART_OS))
169+
$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE))
170170
endif
171171

172172
$(BUILD)/uart.o: $(CONFVARS_FILE)
173173

174-
$(BUILD)/frozen.c: $(wildcard $(SCRIPTDIR)/*) $(CONFVARS_FILE)
174+
$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(CONFVARS_FILE)
175175
$(ECHO) "Generating $@"
176-
$(Q)$(MAKE_FROZEN) $(SCRIPTDIR) > $@
176+
$(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@
177177

178178
# to build .mpy files from .py files
179179
$(BUILD)/$(FROZEN_MPY_DIR)/%.mpy: $(FROZEN_MPY_DIR)/%.py

0 commit comments

Comments
 (0)