diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-11-28 18:19:48 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-11-28 18:19:48 +0200 |
| commit | b369c1bb9601f83761257d9ba47adef5cbb9ea7b (patch) | |
| tree | c661d9b41eaf210022efa2b009dc943b970e28c8 | |
| parent | a036554a77c50fc4aabf056d93f7b3170ee4af21 (diff) | |
zephyr/Makefile: Make prj_$(BOARD).conf optional, again.
This time hopefully should work reliably, using make $(wildcard) function,
which in this case either expands to existing prj_$(BOARD).conf file, or to
an empty string for non-existing one.
| -rw-r--r-- | ports/zephyr/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/zephyr/Makefile b/ports/zephyr/Makefile index ec2bbbcb6..2327cf73c 100644 --- a/ports/zephyr/Makefile +++ b/ports/zephyr/Makefile @@ -89,8 +89,10 @@ z_clean: $(MAKE) -f Makefile.zephyr BOARD=$(BOARD) clean # This rule is for prj_$(BOARD)_merged.conf, not $(CONF_FILE), which -# can be overriden -prj_$(BOARD)_merged.conf: prj_base.conf prj_$(BOARD).conf +# can be overriden. +# prj_$(BOARD).conf is optional, that's why it's resolved with $(wildcard) +# function. +prj_$(BOARD)_merged.conf: prj_base.conf $(wildcard prj_$(BOARD).conf) $(PYTHON) makeprj.py prj_base.conf prj_$(BOARD).conf $@ test: |