From e1621a4a2a6b1750402d0228cf85920814babc9a Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson
Date: Wed, 11 Jul 2007 14:06:06 +0000
Subject: Use <package>_VERSION in all <package>.mk instead of <package>_VER

---
 package/cvs/cvs.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'package/cvs')

diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index f7ada9105..7e2ecb8df 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -3,11 +3,11 @@
 # cvs
 #
 #############################################################
-CVS_VER:=1.12.13
-CVS_SOURCE:=cvs_$(CVS_VER).orig.tar.gz
-CVS_PATCH:=cvs_$(CVS_VER)-8.diff.gz
+CVS_VERSION:=1.12.13
+CVS_SOURCE:=cvs_$(CVS_VERSION).orig.tar.gz
+CVS_PATCH:=cvs_$(CVS_VERSION)-8.diff.gz
 CVS_SITE:=http://ftp.debian.org/debian/pool/main/c/cvs/
-CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VER)
+CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VERSION)
 CVS_CAT:=$(ZCAT)
 CVS_BINARY:=src/cvs
 CVS_TARGET_BINARY:=usr/bin/cvs
@@ -35,15 +35,15 @@ cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
 $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
 	-mkdir $(CVS_DIR)
 	$(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(CVS_DIR) $(TAR_OPTIONS) -
-	$(BZCAT) $(CVS_DIR)/cvs-$(CVS_VER)/cvs-$(CVS_VER).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	rm -rf $(CVS_DIR)/cvs-$(CVS_VER)
+	$(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION)
 	$(CONFIG_UPDATE) $(CVS_DIR)
-	toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VER)\*.patch
+	toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch
 ifneq ($(CVS_PATCH),)
 	toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH)
 	if [ -d $(CVS_DIR)/debian/patches ]; then \
 		(cd $(CVS_DIR)/debian/patches && for i in * ; \
-		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VER)/,+++ cvs-$(CVS_VER)/,' $$i ; \
+		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i ; \
 		 done ; \
 		) ; \
 		toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \* ; \
-- 
cgit v1.2.3-55-g7522