fedora-release Makefile,1.6,1.7

[Jesse Keating]

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv334

Modified Files:
	Makefile 
Log Message:
Finally fix the tagging.  I hate CVS and make files



Index: Makefile
===================================================================
RCS file: /cvs/fedora/fedora-release/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	7 Aug 2009 23:47:33 -0000	1.6
+++ Makefile	7 Aug 2009 23:52:14 -0000	1.7
@@ -1,9 +1,9 @@
-VERSION=$(shell awk '/Version/ { print $$2 }' fedora-release.spec)
-RELEASE=$(shell awk '/Release/ { print $$2 }' fedora-release.spec)
+VERSION=$(shell awk '/Version:/ { print $$2 }' fedora-release.spec)
+RELEASE=$(shell awk '/Release:/ { print $$2 }' fedora-release.spec)
 
 CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
 
-CVSTAG = V$(subst .,-,$(VERSION)-$(RELEASE))
+CVSTAG = V$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
 
 all: