From 46fa667cce733e1dd62fa14e501547e2234d4ad7 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sun, 17 Jun 2007 13:01:37 +0000
Subject: [PATCH] defs.mk: Fix missing -dev in development version

  - (Hopefully) fixed missing -dev in development version
  - Remove duplicate -D_DO_TRACE_
---
 make/defs.mk | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 0c5fa204..9087b17d 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -7,8 +7,9 @@
 PROJECT               ?= $(shell (cd $(TOPDIR); basename `pwd`))
 PROJECT_DESCR         ?= No description
 CUSTOMER              ?= No customer
-VERSION               ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION)
-HEX_VERSION            = $(shell echo $(VERSION) | \
+VERSION               ?= $(shell cat $(TOPDIR)/VERSION)
+DIST_VERSION          ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION)
+HEX_VERSION            = $(shell echo $(DIST_VERSION) | \
 	sed 's/-dev//; s/pre[^\.]*//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
 DEVELOPMENT           ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
 USE_PROJECT_LIB       ?= true
@@ -315,11 +316,6 @@ ifeq ($(USE_VALGRIND),true)
 	# LDFLAGS   += 
 endif
 
-ifeq ($(USE_TRACING),true)
-	CFLAGS      += -D_DO_TRACE_
-	CPPFLAGS    += -D_DO_TRACE_
-endif
-
 ifeq ($(USE_STACK_PROTECTOR),true)
 	CFLAGS      += -fstack-protector-all
 #	CFLAGS      += -fstack-protector