Check for DIFFVER and make sure tags happen

diff --git a/xsl/Makefile b/xsl/Makefile
index 26c3c0226f2ea75b73f37e3767812bf1b7063497..1f416f1cec4ddca224816ab1739b1ee6acb5afe2 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -4,8 +4,9 @@ CVS2LOG=../cvstools/cvs2log
 NEXTVER=
 DIFFVER=
 ZIPVER=
-RELVER := $(shell grep "<fm:Version" VERSION | sed "s/ *<\/\?fm:Version>//g")
 CVSCHECK := $(shell cvs -n update 2>&1 | grep -v ^cvs | cut -c3-)
+RELVER := $(shell grep "<fm:Version" VERSION | sed "s/ *<\/\?fm:Version>//g")
+TAGVER := $(shell echo "V$(RELVER)" | sed "s/\.//g")
 SFRELID=
 
 DIRS=common html fo extensions htmlhelp javahelp
@@ -45,11 +46,16 @@ endif
 
 newversion:
 ifeq ($(CVSCHECK),)
+ifeq ($(DIFFVER),)
+       @echo "DIFFVER must be specified."
+else
 ifeq ($(NEXTVER),$(RELVER))
+       cvs tag $(TAGVER)
        $(MAKE) DIFFVER=$(DIFFVER) distrib
 else
        @echo "VERSION $(RELVER) doesn't match specified version $(NEXTVER)."
 endif
+endif
 else
        @echo "CVS is not up-to-date! ($(CVSCHECK))"
 endif