From 6aad0b60cfcbcab29f53e97f90e37e6b2613f9cd Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 25 Jul 2002 20:28:49 +0000
Subject: [PATCH] cfg_dev.mk, rpmdist.mk: Kick out cat VERSION mechanism

---
 make/cfg_dev.mk | 2 +-
 make/rpmdist.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/cfg_dev.mk b/make/cfg_dev.mk
index 3b627af3..0cb0a311 100644
--- a/make/cfg_dev.mk
+++ b/make/cfg_dev.mk
@@ -4,7 +4,7 @@
 # $Id$
 
 #CONTRIBDIR       = $(TOPDIR)/contrib
-PREFIX           = $(HOME)/dat/test/$(PROJECT)-$(shell cat $(TOPDIR)/VERSION)
+PREFIX           = $(HOME)/dat/test/$(PROJECT)-$(YTOOLS_VERSION)
 VAR_PREFIX       = $(PREFIX)/var
 DOC_PREFIX       = $(PREFIX)/doc/$(PROJECT)
 EXEGROUP         = $(shell id -gn)
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index e86631ca..df948368 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -12,7 +12,7 @@ ifndef FTP_DIR_MODE
 FTP_DIR_MODE = 750
 endif
 
-RPM_VERSION := $(shell cat VERSION | sed -e s'/-dev//')
+RPM_VERSION = $(VERSION)
 
 CLEAN                    += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
 DIST_SRC_DIR              = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)