btrc & btrd

[m6w6/btr] / share / btr / source / cvs.mk

diff --git a/share/btr/source/cvs.mk b/share/btr/source/cvs.mk
index 839efa2bbacc3b9c5fb14d6e5d11596974a9c982..7682d2a0654e12f5d3a68e3f4f320346ce2b3c28 100644 (file)
--- a/share/btr/source/cvs.mk
+++ b/share/btr/source/cvs.mk
@@ -1,31 +1,31 @@
-SOURCE_CLEAN=false
-CVSROOT=$(shell cut -d'\#' -f1 <<<$(SOURCE_ARGS))
-CVS_MOD=$(shell cut -d'\#' -f2 -s <<<$(SOURCE_ARGS))
+BTR_SOURCE_CLEAN=false
+CVSROOT=$(shell cut -d'\#' -f1 <<<$(BTR_SOURCE_ARGS))
+CVS_MOD=$(shell cut -d'\#' -f2 -s <<<$(BTR_SOURCE_ARGS))
 CVS_RSH=ssh
 
 export
 
-ifeq ($(value QUIET_FLAG), -q)
-override QUIET_FLAG = -Q
+ifeq ($(value BTR_QUIET_FLAG), -q)
+override BTR_QUIET_FLAG = -Q
 endif
 
 .PHONY: all clean login
 .SUFFIXES:
 
-all: $(BRANCH_DIR) clean
-       $(SAY) "Updating $(BRANCH)..."
-       cd $(BRANCH_DIR) && \
-               cvs $(QUIET_FLAG) -z3 update -RPd;
+all: $(BTR_BRANCH_DIR) clean
+       $(SAY) "Updating $(BTR_BRANCH)..."
+       cd $(BTR_BRANCH_DIR) && \
+               cvs $(BTR_QUIET_FLAG) -z3 update -RPd;
 
-clean: $(BRANCH_DIR)
-       if $(SOURCE_CLEAN); \
+clean: $(BTR_BRANCH_DIR)
+       if $(BTR_SOURCE_CLEAN); \
        then \
-               cd $(BRANCH_DIR) && \
-                       cvs $(QUIET_FLAG) -z3 update -CRPd; \
+               cd $(BTR_BRANCH_DIR) && \
+                       cvs $(BTR_QUIET_FLAG) -z3 update -CRPd; \
        fi;
 
-$(BRANCH_DIR):
+$(BTR_BRANCH_DIR):
        $(SAY) "Performing checkout of $(CVS_MOD) from $(CVSROOT)..."
-       cvs $(QUIET_FLAG) checkout -RP -r $(BRANCH) -d $(BRANCH_DIR) $(CVS_MOD)
+       cvs $(BTR_QUIET_FLAG) checkout -RP -r $(BTR_BRANCH) -d $(BTR_BRANCH_DIR) $(CVS_MOD)
 
 # vim: noet