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)