diff options
| author | Roland McGrath <roland@gnu.org> | 2004-12-20 23:15:28 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-12-20 23:15:28 +0000 |
| commit | 9b36a8652579a3242051137295d43b193b7b41ac (patch) | |
| tree | 141bc700aefbb17c3c94087b5437dafac510b928 | |
| parent | 861d5124ab90bdf0a98fb7212556c58be006eb46 (diff) | |
Fix tag name in on-branch case.
| -rw-r--r-- | fedora/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 27aff23ef3..1482a86e05 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),\ |