[zaptel-commits] kpfleming: branch 1.4 r2087 - in /branches/1.4: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Feb  5 15:55:42 2007
New Revision: 2087

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2087
Log:
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

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/Makefile

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2087&r1=2086&r2=2087
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Feb  5 15:55:42 2007
@@ -117,10 +117,10 @@
 
 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