Skip to content

Commit

Permalink
Makefile: Fix the EMBEDDED_VERSION setting
Browse files Browse the repository at this point in the history
When there is no EXTRA_VERSION, use VERSION verbatim.

Signed-off-by: Gergely Nagy <[email protected]>
  • Loading branch information
algernon committed Jul 28, 2022
1 parent 0f805a1 commit 115cf6a
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
VERSION="0.11.0-snapshot"

ifeq (${VERSION},$(subst -snapshot,,${VERSION}))
EMBEDDED_VERSION="${VERSION}+${EXTRA_VERSION}"
ifdef EXTRA_VERSION
ifeq (${VERSION},$(subst -snapshot,,${VERSION}))
EMBEDDED_VERSION="${VERSION}+${EXTRA_VERSION}"
else
EMBEDDED_VERSION="${VERSION}.${EXTRA_VERSION}"
endif
else
EMBEDDED_VERSION="${VERSION}.${EXTRA_VERSION}"
EMBEDDED_VERSION="${VERSION}"
endif

BOARDS = \
Expand Down

0 comments on commit 115cf6a

Please sign in to comment.