From 7779737b5ce36ee3d99eec1c00524aa20e38f458 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Mon, 5 Feb 2007 21:56:21 +0000
Subject: Merged revisions 2087 via svnmerge from
 https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2087 | kpfleming | 2007-02-05 15:55:42 -0600 (Mon, 05 Feb 2007) | 10 lines

Merged revisions 2086 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2086 | kpfleming | 2007-02-05 15:54:40 -0600 (Mon, 05 Feb 2007) | 2 lines

fix version-numbering logic

........

................


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2088 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 66f0460..fb46314 100644
--- a/Makefile
+++ b/Makefile
@@ -117,11 +117,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
 
 LTZ_A:=libtonezone.a
 LTZ_A_OBJS:=zonedata.o tonezone.o
-- 
cgit v1.2.3