Clean up version-related variables.

diff --git a/Makefile.maint b/Makefile.maint
index 0813133413b780d3530bdcff5d1ec8edd6a148c5..92e99ecf354cc2f9ad1b1479cc2643ffb722915e 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -11,10 +11,15 @@ maintainer-check:
        $(MAKE) distcheck
        $(MAKE) my-distcheck
 
-prev-version := $(shell echo $(VERSION)|tr a-z Xa-y)
+prev_version_file = .prev-version
+
+THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
+PREV_VERSION := $(shell cat $(prev_version_file))
+PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
+
 tag-package = $(shell echo "$(PACKAGE)" | tr a-z A-Z)
 tag-this-version = $(subst .,_,$(VERSION))
-tag-prev-version = $(subst .,_,$(prev-version))
+tag-prev-version = $(subst .,_,$(PREV_VERSION))
 this-cvs-tag = $(tag-package)-$(tag-this-version)
 prev-cvs-tag = $(tag-package)-$(tag-prev-version)
 
@@ -70,14 +75,6 @@ my-distcheck: writable-files po-check
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 
-prev_version_file = .prev-version
-
-THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
-# FIXME: this works only for Gnits-style test releases.
-PREV_VERSION := $(shell cat $(prev_version_file))
-PREV_VERSION_REGEXP := $(shell echo $(PREV_VERSION)|sed 's/\./\\./g')
-v = Version
-
 a_host = alpha.gnu.org
 b_host = freefriends.org