From 1a32fe9c80c63587d2ef639c698649911f35e846 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 10 Aug 2018 20:29:37 +0100
Subject: Update git tag generation for Mageia conventions.

---
 Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2e368dc..dcacb0e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 VERSION = 6.11
 PACKAGE = desktop-common-data
 NAME = desktop-common-data
-TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 mandir=/usr/share/man
 
 menus: applications.menu plasma-applications.menu
@@ -29,10 +28,6 @@ checktag:
 	   exit 1 ; \
 	 fi ; \
 	fi
-	@if [ "x$(VERSION)" == "x" -o "x$(RELEASE)" = "x" ]; then \
-	   echo usage is "make VERSION=version_number RELEASE=release_number dist" ; \
-	   exit 1 ; \
-	fi
 
 clean:
 	find . -type d -name '.xvpics' -o -name '*~' |xargs rm -rf
@@ -45,4 +40,4 @@ dist: menus checktag clean
 	$(info $(NAME)-$(VERSION).tar.xz is ready)
 
 tag: checktag
-	git tag $(TAG); \
+	git tag $(VERSION); \
-- 
cgit v1.2.1