summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-02-05 21:54:40 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-02-05 21:54:40 +0000
commitb54134676d172610106b6ddc33cea0bd7c162582 (patch)
treecf9eef159d87eea7d69819b8ae8e7e9d25644be2 /Makefile
parent1a8c2e2c0e19625af742f3600f4222622ca8ffb5 (diff)
fix version-numbering logic
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2086 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f25edba..f9f7502 100644
--- a/Makefile
+++ b/Makefile
@@ -127,11 +127,11 @@ endif
ifneq ($(wildcard .version),)
ZAPTELVERSION:=$(shell cat .version)
-endif
-
+else
ifneq ($(wildcard .svn),)
ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
endif
+endif
TZOBJS:=zonedata.lo tonezone.lo
LIBTONEZONE_SO:=libtonezone.so