From: Roland McGrath <roland@gnu.org>
Date: Mon, 20 Dec 2004 23:15:28 +0000 (+0000)
Subject: Fix tag name in on-branch case.
X-Git-Tag: cvs/fedora-glibc-2_3_4-3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b36a8652579a3242051137295d43b193b7b41ac;p=thirdparty%2Fglibc.git

Fix tag name in on-branch case.
---

diff --git a/fedora/Makefile b/fedora/Makefile
index 27aff23ef35..1482a86e053 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -17,8 +17,9 @@ on-branch = $(filter-out HEAD,$(glibc-base))
 snapshot-date := $($(glibc-branch)-sync-date)
 snapshot-name := $(shell date -u -d '$(snapshot-date)' $(snapshot-name-fmt))
 
-tar-name := glibc$(subst _,.,$(patsubst glibc-%-branch,-%,\
-					$(filter-out HEAD,$(glibc-base))))
+tag-name := glibc$(patsubst glibc-%-branch,-%,\
+			    $(filter-out HEAD,$(glibc-base)))
+tar-name := $(subst _,.,$(tag-name))
 select-snapshot = -r '$($(glibc-branch)-sync-tag)'
 snapshot-id = $($(glibc-branch)-sync-tag)
 
@@ -28,7 +29,7 @@ branch.mk-vars = glibc-branch glibc-base DIST_BRANCH COLLECTION
 update:
 	now=`date -u $(snapshot-date-fmt)`; \
 	name=`date -u -d "$$now" $(snapshot-name-fmt)`; \
-	new="$(tag-prefix)$(tar-name)-$$name"; \
+	new="$(tag-prefix)$(tag-name)-$$name"; \
 	cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\
 	(echo '# This file is updated automatically by Makefile.'; \
 	 $(foreach var,$(branch.mk-vars),\