From 5e65b291566159463585ee50f4aa1dbbd8516178 Mon Sep 17 00:00:00 2001 From: Epicpkmn11 Date: Mon, 12 Aug 2019 07:40:33 -0500 Subject: [PATCH] Actually fix it (I'm pretty sure) --- arm9/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arm9/Makefile b/arm9/Makefile index 66b9a9443..b89fbe5f4 100755 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -5,9 +5,9 @@ ifeq ($(strip $(DEVKITARM)),) $(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") endif -# If the branch starts with 'v', assume it's a release build -ifeq ($(shell echo $(shell git rev-parse --abbrev-ref HEAD) | head -c 1), v) -GIT_VER := $(shell git rev-parse --abbrev-ref HEAD) +# If on a tagged commit, use the tag instead of the commit +ifneq ($(shell echo $(shell git describe --contains) | head -c 1),) +GIT_VER := $(shell git describe --contains) else GIT_VER := $(shell git rev-parse --short HEAD) endif