Makefile: fix VERSION again
The variable is not undefined anymore after the first assignment, so we should check if variable is empty instead.master
parent
2293609dcb
commit
a76aa8e390
8
Makefile
8
Makefile
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue