diff --git a/make/defs.mk b/make/defs.mk index c271516a..0419e093 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -37,6 +37,9 @@ SED = sed CAT = /bin/cat SHELL = /bin/bash +CVS_PROJ_DIR ?= $(TOPDIR)/.. +CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. + PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt) PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) PROJECT_SHORT_NAME ?= $(PROJECT) diff --git a/make/proj.mk b/make/proj.mk index f3476391..cc13a25d 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -5,7 +5,6 @@ PROJECT = ytools MODDIR = $(TOPDIR) -CVS_PROJ_DIR = $(TOPDIR)/.. REQUIRED = inst/pre \ make \ diff --git a/make/tex.mk b/make/tex.mk index ed913eac..83b6cc62 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -13,7 +13,6 @@ AUTHORS ?= #SUBTITLE ?= Dienstgüte-Vereinbarungen DATE ?= $(shell date +'%Y/%m/%d') #CONFIDENTIAL_REMARK ?= Vertraulich -#CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. # -- files MAIN ?= main