From: Alexander Tsoy Date: Sun, 8 Mar 2020 02:47:50 +0000 (+0300) Subject: Makefile: fix VERSION again X-Git-Tag: 051~205 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a76aa8e39016a8564adb0f18f93bbf2e15d3243f;p=thirdparty%2Fdracut.git Makefile: fix VERSION again The variable is not undefined anymore after the first assignment, so we should check if variable is empty instead. --- diff --git a/Makefile b/Makefile index c69e2dfcd..02e2c4b5f 100644 --- a/Makefile +++ b/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