docs-common Makefile.common,1.128,1.129

Paul W. Frields (pfrields) fedora-docs-commits at redhat.com
Fri Aug 4 02:57:14 UTC 2006


Author: pfrields

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4554

Modified Files:
	Makefile.common 
Log Message:
Need to make sure that tags are valid! Plus, showvars is useful here
for troubleshooting.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- Makefile.common	4 Aug 2006 02:43:57 -0000	1.128
+++ Makefile.common	4 Aug 2006 02:57:12 -0000	1.129
@@ -212,13 +212,22 @@
 # 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'
 




More information about the docs-commits mailing list