summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul W. Frields <stickster@gmail.com>2006-08-04 02:57:12 +0000
committerPaul W. Frields <stickster@gmail.com>2006-08-04 02:57:12 +0000
commit9ba41f4a0d49d466db3d4d051bccfe4e3e78e3a1 (patch)
tree9fb1d47a1ed41b6ebe19f2aa6360d689eac0411f
parentbbf8d076e2fce7a6ce5e64696efb806bd3537e6b (diff)
downloadfedora-doc-utils-9ba41f4a0d49d466db3d4d051bccfe4e3e78e3a1.tar.gz
fedora-doc-utils-9ba41f4a0d49d466db3d4d051bccfe4e3e78e3a1.tar.xz
fedora-doc-utils-9ba41f4a0d49d466db3d4d051bccfe4e3e78e3a1.zip
Need to make sure that tags are valid! Plus, showvars is useful here
for troubleshooting.
-rw-r--r--Makefile.common11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index be33a4c..b44c8f8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -212,13 +212,22 @@ endif # ifneq "${SPECFILE}" ""
# will prevent repetitive tagging without the user making use of
# TAG_OPTS. I'd say that encourages people to Do The Right Thing by
# changing version numbers where necessary. (PWF)
-TAG?=${DOCBASE}-$(shell version doc)
+TAG_NAME ?= $(shell echo ${DOCBASE} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
+TAG_VERSION ?= $(shell version doc | sed s/\\\./_/g)
+TAG?=${TAG_NAME}-${TAG_VERSION}
tag::
cvs tag ${TAG_OPTS} -c ${TAG}
@echo "Tagged with: ${TAG}"
@echo
+showvars::
+ @echo "TAG_NAME=${TAG_NAME}"
+ @echo "TAG_VERSION=${TAG_VERSION}"
+ @echo "TAG_RELEASE=${TAG_RELEASE}"
+ @echo "TAG=${TAG}"
+ @echo "### (Tag vars do not necessarily reflect CVS status)"
+
help::
@printf ${TFMT} 'tag' 'Tag this directory with the packaging NVR'