Skip to content

Commit

Permalink
Makefile: fix VERSION again
Browse files Browse the repository at this point in the history
The variable is not undefined anymore after the first assignment, so
we should check if variable is empty instead.
  • Loading branch information
puleglot authored and haraldh committed Mar 9, 2020
1 parent 2293609 commit a76aa8e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
-include dracut-version.sh

DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
ifeq ($(DRACUT_MAIN_VERSION),)
DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
endif
DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
ifeq ($(DRACUT_FULL_VERSION),)
DRACUT_FULL_VERSION = $(DRACUT_VERSION)
endif

-include Makefile.inc

Expand Down

0 comments on commit a76aa8e

Please sign in to comment.