This patch adjusts the tag make target to use a separate version with

'~' replaced by '-'. This is needed for mirroring to git as git can't
handle '~'s embedded in tag or branch names.

Tested by setting up a separate tag_version target like so:

tag_version:
	echo ${TAG_VERSION}
This commit is contained in:
Steve Beattie 2011-06-02 18:54:56 -07:00
parent fdae9784f4
commit 33c615e5f9

View file

@ -20,6 +20,11 @@ REPO_URL?=lp:apparmor
RELEASE_DIR=apparmor-${VERSION} RELEASE_DIR=apparmor-${VERSION}
__SETUP_DIR?=. __SETUP_DIR?=.
# We create a separate version for tags because git can't handle tags
# with embedded ~s in them. No spaces around '-' or they'll get
# embedded in ${VERSION}
TAG_VERSION=$(subst ~,-, ${VERSION})
.PHONY: tarball .PHONY: tarball
tarball: clean tarball: clean
REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \ REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
@ -55,4 +60,5 @@ setup:
.PHONY: tag .PHONY: tag
tag: tag:
bzr tag apparmor_${VERSION} bzr tag apparmor_${TAG_VERSION}