From 4697b0079c37c053b44b3e7046554e222a378349 Mon Sep 17 00:00:00 2001 From: Maximus32 Date: Sat, 9 Jan 2021 16:11:54 +0100 Subject: [PATCH] Prevent latest version from being called 'latest' --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ff5cea87d..0954c9c3b 100644 --- a/Makefile +++ b/Makefile @@ -54,13 +54,14 @@ ifneq ($(shell test -d .git; echo $$?),0) endif GIT_TAG = $(shell git describe --exact-match --tags 2>/dev/null) -ifeq ($(GIT_TAG),) - # git revision is not tagged - OPL_VERSION = v$(VERSION).$(SUBVERSION).$(PATCHLEVEL)$(if $(EXTRAVERSION),-$(EXTRAVERSION))-$(REVISION)$(if $(GIT_HASH),-$(GIT_HASH))$(if $(DIRTY),$(DIRTY))$(if $(LOCALVERSION),-$(LOCALVERSION)) -else +OPL_VERSION = v$(VERSION).$(SUBVERSION).$(PATCHLEVEL)$(if $(EXTRAVERSION),-$(EXTRAVERSION))-$(REVISION)$(if $(GIT_HASH),-$(GIT_HASH))$(if $(DIRTY),$(DIRTY))$(if $(LOCALVERSION),-$(LOCALVERSION)) + +ifneq ($(GIT_TAG),) +ifneq ($(GIT_TAG),latest) # git revision is tagged OPL_VERSION = $(GIT_TAG)$(if $(DIRTY),$(DIRTY)) endif +endif FRONTEND_OBJS = pad.o fntsys.o renderman.o menusys.o OSDHistory.o system.o lang.o config.o hdd.o dialogs.o \ dia.o ioman.o texcache.o themes.o supportbase.o usbsupport.o ethsupport.o hddsupport.o \